Skip to content

Commit 574cbe5

Browse files
committed
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.
2 parents b9ff86e + 9485261 commit 574cbe5

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

src/doc/rust.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ The keywords are the following strings:
208208

209209
~~~~ {.notrust .keyword}
210210
as
211-
break
211+
box break
212212
crate
213213
else enum extern
214214
false fn for

src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<keyword>as</keyword>
3939
<keyword>assert</keyword>
4040
<keyword>break</keyword>
41+
<keyword>box</keyword>
4142
<keyword>const</keyword>
4243
<keyword>continue</keyword>
4344
<keyword>crate</keyword>

src/etc/kate/rust.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<list name="keywords">
1919
<item> as </item>
2020
<item> break </item>
21+
<item> box </item>
2122
<item> continue </item>
2223
<item> crate </item>
2324
<item> do </item>

src/etc/vim/syntax/rust.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ syn keyword rustOperator as
1818

1919
syn match rustAssert "\<assert\(\w\)*!" contained
2020
syn match rustFail "\<fail\(\w\)*!" contained
21-
syn keyword rustKeyword break continue
21+
syn keyword rustKeyword break box continue
2222
syn keyword rustKeyword extern nextgroup=rustExternCrate,rustObsoleteExternMod skipwhite
2323
syn keyword rustKeyword for in if impl let
2424
syn keyword rustKeyword loop once priv pub

0 commit comments

Comments
 (0)