summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorBen Blum <bblum@andrew.cmu.edu>2012-06-30 00:19:24 -0400
committerBen Blum <bblum@andrew.cmu.edu>2012-07-02 15:48:59 -0400
commitdc93814bf94ff3f1444b66a5d20b2776e5c11bfa (patch)
tree97ce9c5d3b5ee71c20e204ef462a9f0a16d72a89 /src
parentc74b3fd634754be7c151bfc1fb8ff515b69b0f9a (diff)
downloadrust-dc93814bf94ff3f1444b66a5d20b2776e5c11bfa.tar.gz
rust-dc93814bf94ff3f1444b66a5d20b2776e5c11bfa.zip
minor updates to vim config files
Diffstat (limited to 'src')
-rw-r--r--src/etc/vim/ftdetect/rust.vim2
-rw-r--r--src/etc/vim/syntax/rust.vim7
2 files changed, 5 insertions, 4 deletions
diff --git a/src/etc/vim/ftdetect/rust.vim b/src/etc/vim/ftdetect/rust.vim
index b2fb35911a9..10b616277c8 100644
--- a/src/etc/vim/ftdetect/rust.vim
+++ b/src/etc/vim/ftdetect/rust.vim
@@ -1 +1 @@
-au BufRead,BufNewFile *.rs    set filetype=rust
+au BufRead,BufNewFile *.rs,*.rc set filetype=rust
diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim
index 0195e2be12e..7c09f0af60a 100644
--- a/src/etc/vim/syntax/rust.vim
+++ b/src/etc/vim/syntax/rust.vim
@@ -10,6 +10,7 @@ elseif exists("b:current_syntax")
 endif
 
 syn keyword   rustAssert      assert
+syn match     rustAssert      "assert\(\w\)*"
 syn keyword   rustKeyword     alt as break
 syn keyword   rustKeyword     check claim cont const copy else export extern fail
 syn keyword   rustKeyword     do for if impl import in let log
@@ -33,9 +34,9 @@ syn keyword   rustType        f64 i8 i16 i32 i64 str
 syn keyword   rustBoolean     true false
 
 syn keyword   rustConstant    some none       " option
-" syn keyword   rustConstant    left right      " either
-" syn keyword   rustConstant    ok err          " result
-" syn keyword   rustConstant    success failure " task
+syn keyword   rustConstant    left right      " either
+syn keyword   rustConstant    ok err          " result
+syn keyword   rustConstant    success failure " task
 " syn keyword   rustConstant    cons nil        " list
 " syn keyword   rustConstant    empty node      " tree