about summary refs log tree commit diff
path: root/src/etc
diff options
context:
space:
mode:
authorMatt Brubeck <mbrubeck@cs.hmc.edu>2012-01-20 16:08:51 -0800
committerMatt Brubeck <mbrubeck@cs.hmc.edu>2012-01-20 16:08:51 -0800
commit155601eefe58362a2958a66318e97f7776e77b1d (patch)
tree85d390f87bbdcfed730b3fb4b1dcee91a62ddfbd /src/etc
parent4efdab0059c787c030bfbb32c052bd151e6964d1 (diff)
downloadrust-155601eefe58362a2958a66318e97f7776e77b1d.tar.gz
rust-155601eefe58362a2958a66318e97f7776e77b1d.zip
Update the keyword lists in rust.md and syntax.vim
Add new keywords "enum" and "of", and remove old keywords "auth", "chan",
"log_err", "tag", and "task".

Also add reserved words to the syntax file, to help Vim users avoid using them
as identifiers.
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/vim/syntax/rust.vim13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim
index 417d53c56fa..17d59eeddbb 100644
--- a/src/etc/vim/syntax/rust.vim
+++ b/src/etc/vim/syntax/rust.vim
@@ -14,15 +14,18 @@ if !exists("main_syntax")
   let main_syntax='rust'
 endif
 
-syn keyword   rustKeyword     alt as assert auth be bind block break chan
+syn keyword   rustKeyword     alt as assert be bind block break
 syn keyword   rustKeyword     check claim cont const copy do else enum export fail
 syn keyword   rustKeyword     fn for if iface impl import in inline lambda let log
-syn keyword   rustKeyword     log_err mod mutable native note of prove pure
-syn keyword   rustKeyword     resource ret self tag type unsafe use while
-syn keyword   rustKeyword     with
+syn keyword   rustKeyword     mod mutable native note of prove pure
+syn keyword   rustKeyword     resource ret self syntax type unchecked
+syn keyword   rustKeyword     unsafe use while with
+
+" Reserved words
+syn keyword   rustKeyword     m32 m64 m128 f80 f16 f128 class trait
 
 syn keyword   rustType        any int uint float char bool u8 u16 u32 u64 f32
-syn keyword   rustType        f64 i8 i16 i32 i64 str task
+syn keyword   rustType        f64 i8 i16 i32 i64 str
 
 syn keyword   rustBoolean     true false