From 84c60186fcb928b7741714ede8e263d6ba95fd0b Mon Sep 17 00:00:00 2001
From: Kevin Ballard <kevin@sb.org>
Date: Fri, 14 Feb 2014 11:27:53 -0800
Subject: [PATCH 1/4] Update vim syntax for extern crate

---
 src/etc/vim/syntax/rust.vim | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim
index 9aa76cad83e..32a2f0860ed 100644
--- a/src/etc/vim/syntax/rust.vim
+++ b/src/etc/vim/syntax/rust.vim
@@ -3,7 +3,7 @@
 " Maintainer:   Patrick Walton <pcwalton@mozilla.com>
 " Maintainer:   Ben Blum <bblum@cs.cmu.edu>
 " Maintainer:   Chris Morgan <me@chrismorgan.info>
-" Last Change:  2014 Jan 4
+" Last Change:  2014 Feb 14
 
 if version < 600
   syntax clear
@@ -18,7 +18,8 @@ syn keyword   rustOperator    as
 
 syn match     rustAssert      "\<assert\(\w\)*!" contained
 syn match     rustFail        "\<fail\(\w\)*!" contained
-syn keyword   rustKeyword     break continue do extern
+syn keyword   rustKeyword     break continue do
+syn keyword   rustKeyword     extern nextgroup=rustExternCrate skipwhite
 syn keyword   rustKeyword     for in if impl let
 syn keyword   rustKeyword     loop once priv pub
 syn keyword   rustKeyword     return
@@ -31,6 +32,10 @@ syn keyword   rustKeyword     proc
 syn keyword   rustStorage     mut ref static
 syn keyword   rustObsoleteStorage const
 
+syn keyword   rustInvalidBareKeyword crate
+
+syn keyword   rustExternCrate crate contained nextgroup=rustIdentifier skipwhite
+
 syn match     rustIdentifier  contains=rustIdentifierPrime "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
 syn match     rustFuncName    "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
 
@@ -245,6 +250,8 @@ hi def link rustDeriving      PreProc
 hi def link rustStorage       StorageClass
 hi def link rustObsoleteStorage Error
 hi def link rustLifetime      Special
+hi def link rustInvalidBareKeyword Error
+hi def link rustExternCrate   rustKeyword
 
 " Other Suggestions:
 " hi rustAttribute ctermfg=cyan

From c718e0e254a8f07a47b1a7bd597af3b2a315a55f Mon Sep 17 00:00:00 2001
From: Kevin Ballard <kevin@sb.org>
Date: Fri, 14 Feb 2014 12:02:18 -0800
Subject: [PATCH 2/4] Add CheckedDiv to vim syntax

---
 src/etc/vim/syntax/rust.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim
index 32a2f0860ed..aac759e3950 100644
--- a/src/etc/vim/syntax/rust.vim
+++ b/src/etc/vim/syntax/rust.vim
@@ -86,7 +86,7 @@ syn keyword rustTrait OrdIterator MutableDoubleEndedIterator ExactSize
 
 syn keyword rustTrait Algebraic Trigonometric Exponential Hyperbolic
 syn keyword rustTrait Bitwise Bounded Integer Fractional Real RealExt
-syn keyword rustTrait Num NumCast CheckedAdd CheckedSub CheckedMul
+syn keyword rustTrait Num NumCast CheckedAdd CheckedSub CheckedMul CheckedDiv
 syn keyword rustTrait Orderable Signed Unsigned Round
 syn keyword rustTrait Primitive Int Float ToStrRadix ToPrimitive FromPrimitive
 syn keyword rustTrait GenericPath Path PosixPath WindowsPath

From fff12220af512cf3b70c421542fbeadf9577b69d Mon Sep 17 00:00:00 2001
From: Kevin Ballard <kevin@sb.org>
Date: Fri, 14 Feb 2014 14:36:37 -0800
Subject: [PATCH 3/4] Add crate to emacs and kate modefiles

---
 src/etc/emacs/rust-mode.el | 1 +
 src/etc/kate/rust.xml      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/etc/emacs/rust-mode.el b/src/etc/emacs/rust-mode.el
index bf5fec39f82..95732f2553c 100644
--- a/src/etc/emacs/rust-mode.el
+++ b/src/etc/emacs/rust-mode.el
@@ -130,6 +130,7 @@
   '("as"
     "break"
     "continue"
+    "crate"
     "do"
     "else" "enum" "extern"
     "false" "fn" "for"
diff --git a/src/etc/kate/rust.xml b/src/etc/kate/rust.xml
index c52473f5f07..288085d8bae 100644
--- a/src/etc/kate/rust.xml
+++ b/src/etc/kate/rust.xml
@@ -19,6 +19,7 @@
 		<item> as </item>
 		<item> break </item>
 		<item> continue </item>
+		<item> crate </item>
 		<item> do </item>
 		<item> drop </item>
 		<item> else </item>

From 33b2b8a16fe50447007b2862c0530ccf7df39301 Mon Sep 17 00:00:00 2001
From: Kevin Ballard <kevin@sb.org>
Date: Fri, 14 Feb 2014 15:37:22 -0800
Subject: [PATCH 4/4] Add crate keyword to gedit language spec

---
 src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang b/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang
index 88640129708..b9b0aa55a86 100644
--- a/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang
+++ b/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang
@@ -40,6 +40,7 @@
 		<keyword>break</keyword>
 		<keyword>const</keyword>
 		<keyword>continue</keyword>
+		<keyword>crate</keyword>
 		<keyword>do</keyword>
 		<keyword>drop</keyword>
 		<keyword>else</keyword>