auto merge of #13986 : alexcrichton/rust/box-keyword, r=thestinger

This keyword is about to be used much more often than it was a few weeks ago,
it's time to tell editors about the new keyword.
This commit is contained in:
bors 2014-05-08 03:06:37 -07:00
commit 574cbe5b07
4 changed files with 4 additions and 2 deletions

View File

@ -208,7 +208,7 @@ The keywords are the following strings:
~~~~ {.notrust .keyword}
as
break
box break
crate
else enum extern
false fn for

View File

@ -38,6 +38,7 @@
<keyword>as</keyword>
<keyword>assert</keyword>
<keyword>break</keyword>
<keyword>box</keyword>
<keyword>const</keyword>
<keyword>continue</keyword>
<keyword>crate</keyword>

View File

@ -18,6 +18,7 @@
<list name="keywords">
<item> as </item>
<item> break </item>
<item> box </item>
<item> continue </item>
<item> crate </item>
<item> do </item>

View File

@ -18,7 +18,7 @@ syn keyword rustOperator as
syn match rustAssert "\<assert\(\w\)*!" contained
syn match rustFail "\<fail\(\w\)*!" contained
syn keyword rustKeyword break continue
syn keyword rustKeyword break box continue
syn keyword rustKeyword extern nextgroup=rustExternCrate,rustObsoleteExternMod skipwhite
syn keyword rustKeyword for in if impl let
syn keyword rustKeyword loop once priv pub