auto merge of #16547 : huonw/rust/new-kw, r=pcwalton

Author: bors

src/etc/emacs/rust-mode.el

@@ -170,7 +170,7 @@
 (defconst rust-mode-keywords
   '("as"
     "box" "break"
-    "continue" "crate"
+    "const" "continue" "crate"
     "do"
     "else" "enum" "extern"
     "false" "fn" "for"
@@ -182,7 +182,8 @@
     "self" "static" "struct" "super"
     "true" "trait" "type"
     "unsafe" "use"
-    "while"))
+    "virtual"
+    "where" "while"))
 
 (defconst rust-special-types
   '("u8" "i8"

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

@@ -71,6 +71,8 @@
 		<keyword>trait</keyword>
 		<keyword>unsafe</keyword>
 		<keyword>use</keyword>
+		<keyword>virtual</keyword>
+		<keyword>where</keyword>
 		<keyword>while</keyword>
     </context>
 

src/etc/kate/rust.xml

@@ -19,6 +19,7 @@
 		<item> as </item>
 		<item> break </item>
 		<item> box </item>
+		<item> const </item>
 		<item> continue </item>
 		<item> crate </item>
 		<item> do </item>
@@ -44,6 +45,8 @@
 		<item> trait </item>
 		<item> unsafe </item>
 		<item> use </item>
+		<item> virtual </item>
+		<item> where </item>
 		<item> while </item>
 	</list>
 	<list name="traits">

src/etc/vim/syntax/rust.vim

@@ -26,7 +26,7 @@ syn keyword   rustKeyword     fn nextgroup=rustFuncName skipwhite skipempty
 syn keyword   rustKeyword     for in if impl let
 syn keyword   rustKeyword     loop once proc pub
 syn keyword   rustKeyword     return super
-syn keyword   rustKeyword     unsafe virtual while
+syn keyword   rustKeyword     unsafe virtual where while
 syn keyword   rustKeyword     use nextgroup=rustModPath,rustModPathInUse skipwhite skipempty
 " FIXME: Scoped impl's name is also fallen in this category
 syn keyword   rustKeyword     mod trait struct enum type nextgroup=rustIdentifier skipwhite skipempty