---

yaml
---
r: 16012
b: refs/heads/try
c: a16cb37
h: refs/heads/master
v: v3

Author: paulstansifer

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 5f154770e2e921e717127b9fe95e09856305fd6f
+refs/heads/try: a16cb376ac214d1cb07b88292a9f81587ac1bc1d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/etc/emacs/rust-mode.el

@@ -54,9 +54,21 @@
   (let ((table (make-hash-table :test 'equal)))
     (dolist (word '("mod" "type" "resource" "fn" "enum" "iface" "impl"))
       (puthash word 'def table))
-    (dolist (word '("if" "else" "while" "do" "for" "break" "cont" "ret" "be" "fail" "const"
-                    "check" "assert" "claim" "prove" "native" "import" "export" "let" "mut" "log"
-                    "use" "pure" "unsafe"))
+    (dolist (word '("assert"
+                    "be" "break"
+                    "check" "claim" "class" "const" "cont" "copy" "crust"
+                    "drop"
+                    "else" "export"
+                    "fail" "for"
+                    "if" "import"
+                    "let" "log" "loop"
+                    "mut"
+                    "native" "new"
+                    "pure"
+                    "ret"
+                    "trait"
+                    "unchecked" "unsafe"
+                    "while"))
       (puthash word t table))
     (puthash "alt" 'alt table)
     (dolist (word '("true" "false")) (puthash word 'atom table))

branches/try/src/etc/vim/syntax/rust.vim

@@ -15,7 +15,7 @@ if !exists("main_syntax")
 endif
 
 syn keyword   rustKeyword     alt as assert be bind break
-syn keyword   rustKeyword     check claim cont const copy do else export fail
+syn keyword   rustKeyword     check claim cont const copy else export fail
 syn keyword   rustKeyword     for if impl import in inline lambda let log
 syn keyword   rustKeyword     loop mod mut mutable native note of prove pure
 syn keyword   rustKeyword     ret self syntax to unchecked