---

yaml
---
r: 30713
b: refs/heads/incoming
c: 8baed1f
h: refs/heads/master
i:
  30711: d6a58e3
v: v3

Author: bblum

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: acab1cd2ceff321b5e06cf914ad905b4b2545d63
+refs/heads/incoming: 8baed1f25f5fcec221dfd93e0c29b723725bcabe
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     Rust
 " Maintainer:   Patrick Walton <[email protected]>
-" Maintainer:   Ben Blum <bblum@mozilla.com>
+" Maintainer:   Ben Blum <bblum@cs.cmu.edu>
 " Last Change:  2012 Jul 06
 
 if version < 600
@@ -14,7 +14,7 @@ syn match     rustAssert      "\<assert\(\w\)*"
 syn keyword   rustKeyword     again as break
 syn keyword   rustKeyword     const copy do drop else export extern fail
 syn keyword   rustKeyword     for if impl import in let log
-syn keyword   rustKeyword     loop match mod module move mut new of owned priv pure
+syn keyword   rustKeyword     loop match mod module move mut new of priv pure
 syn match     rustKeyword     "\<pub\>"
 syn keyword   rustKeyword     ref return static to unchecked
 syn match     rustKeyword     "\<unsafe\>" " Allows also matching unsafe::foo()
@@ -42,6 +42,11 @@ syn keyword   rustType        size_t ptrdiff_t clock_t time_t
 syn keyword   rustType        c_longlong c_ulonglong intptr_t uintptr_t
 syn keyword   rustType        off_t dev_t ino_t pid_t mode_t ssize_t
 
+syn keyword   rustTrait       Const Copy Send Owned " inherent traits
+syn keyword   rustTrait       Eq Ord Num Ptr
+syn keyword   rustTrait       Add Sub Mul Div Modulo Neg BitAnd BitOr BitXor
+syn keyword   rustTrait       Shl Shr Index
+
 syn keyword   rustSelf        self
 syn keyword   rustBoolean     true false
 
@@ -109,6 +114,7 @@ syn keyword   rustTodo        TODO FIXME XXX NB
 hi def link rustHexNumber       rustNumber
 hi def link rustBinNumber       rustNumber
 hi def link rustIdentifierPrime rustIdentifier
+hi def link rustTrait           rustType
 
 hi def link rustFormat        Special
 hi def link rustString        String