auto merge of #9401 : bytbox/rust/master, r=thestinger

Along with a tiny bit of cleanup in rust.vim.
This commit is contained in:
bors 2013-09-21 22:20:56 -07:00
commit eabcb39f8d
3 changed files with 1 additions and 4 deletions

View File

@ -39,7 +39,6 @@
<keyword>assert</keyword>
<keyword>break</keyword>
<keyword>const</keyword>
<keyword>copy</keyword>
<keyword>do</keyword>
<keyword>drop</keyword>
<keyword>else</keyword>

View File

@ -18,7 +18,6 @@
<list name="keywords">
<item> as </item>
<item> break </item>
<item> copy </item>
<item> do </item>
<item> drop </item>
<item> else </item>

View File

@ -18,9 +18,8 @@ syn keyword rustOperator as
syn match rustAssert "\<assert\(\w\)*!" contained
syn match rustFail "\<fail\(\w\)*!" contained
syn keyword rustKeyword break copy do extern
syn keyword rustKeyword break do extern
syn keyword rustKeyword in if impl let log
syn keyword rustKeyword copy do extern
syn keyword rustKeyword for impl let log
syn keyword rustKeyword loop mod once priv pub
syn keyword rustKeyword return