auto merge of #13215 : sfackler/rust/vim-attr, r=alexcrichton

rust-lang · Mar 30, 2014 · 90085a1 · 90085a1
2 parents ec7d0c7 + 6e69712
commit 90085a1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim
@@ -135,7 +135,7 @@ syn match     rustStringContinuation display contained /\\\n\s*/
 syn region    rustString      start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=rustSpecial,rustSpecialError,rustStringContinuation,@Spell
 syn region    rustString      start='r\z(#*\)"' end='"\z1' contains=@Spell
 
-syn region    rustAttribute   start="#\[" end="\]" contains=rustString,rustDeriving
+syn region    rustAttribute   start="#!\?\[" end="\]" contains=rustString,rustDeriving
 syn region    rustDeriving    start="deriving(" end=")" contained contains=rustTrait
 
 " Number literals