From 0c1a345d01f52650ae64c280d7235c00d0a99fd8 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Fri, 1 Feb 2013 13:20:03 -0500 Subject: [PATCH 1/7] vim: export is no longer a keyword --- 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 af308f23a3182..afa649df379a2 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -12,7 +12,7 @@ endif syn match rustAssert "\" From 405b868ae708949fba91c74746f3a5dd8cbe84a9 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Fri, 1 Feb 2013 13:21:31 -0500 Subject: [PATCH 2/7] vim: add Self type --- 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 afa649df379a2..86530c0faa6dc 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -30,7 +30,7 @@ syn match rustFuncName "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\% syn keyword rustKeyword m32 m64 m128 f80 f16 f128 syn keyword rustType int uint float char bool u8 u16 u32 u64 f32 -syn keyword rustType f64 i8 i16 i32 i64 str +syn keyword rustType f64 i8 i16 i32 i64 str Self syn keyword rustType Option Either " Types from libc From 5b47c551b9a38d4598168b88ec1e35e36aa10b56 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Fri, 1 Feb 2013 13:28:35 -0500 Subject: [PATCH 3/7] vim: unsafe:: namespaces were renamed to raw:: --- src/etc/vim/syntax/rust.vim | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index 86530c0faa6dc..ee65c77f9f329 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -17,8 +17,7 @@ syn keyword rustKeyword for if impl let log syn keyword rustKeyword loop match mod move mut once priv pure syn match rustKeyword "\" syn keyword rustKeyword ref return static -syn match rustKeyword "\" " Allows also matching unsafe::foo() -syn keyword rustKeyword use while +syn keyword rustKeyword unsafe use while " FIXME: Scoped impl's name is also fallen in this category syn keyword rustKeyword mod trait struct enum type nextgroup=rustIdentifier skipwhite syn keyword rustKeyword fn nextgroup=rustFuncName skipwhite From 1c3cca8a578e21eecbe1c5a103fa0edb0ba1af6a Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Fri, 1 Feb 2013 13:36:38 -0500 Subject: [PATCH 4/7] vim: 'be' is a reserved keyword --- 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 ee65c77f9f329..be44241143d02 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -26,7 +26,7 @@ syn match rustIdentifier contains=rustIdentifierPrime "\%([^[:cntrl:][:spac syn match rustFuncName "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained " Reserved words -syn keyword rustKeyword m32 m64 m128 f80 f16 f128 +syn keyword rustKeyword m32 m64 m128 f80 f16 f128 be syn keyword rustType int uint float char bool u8 u16 u32 u64 f32 syn keyword rustType f64 i8 i16 i32 i64 str Self From 00201c969d5d13e4cf65518dd42d3cacc8916a50 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Fri, 1 Feb 2013 13:47:46 -0500 Subject: [PATCH 5/7] vim: use StorageClass for mut and const --- src/etc/vim/syntax/rust.vim | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index be44241143d02..d04f09ad7233b 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -12,15 +12,16 @@ endif syn match rustAssert "\" syn keyword rustKeyword ref return static syn keyword rustKeyword unsafe use while " FIXME: Scoped impl's name is also fallen in this category syn keyword rustKeyword mod trait struct enum type nextgroup=rustIdentifier skipwhite syn keyword rustKeyword fn nextgroup=rustFuncName skipwhite +syn keyword rustStorage const mut 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 @@ -133,6 +134,7 @@ hi def link rustMacro Macro hi def link rustType Type hi def link rustTodo Todo hi def link rustAttribute PreProc +hi def link rustStorage StorageClass " Other Suggestions: " hi rustAssert ctermfg=yellow From 6052d6747448ec3d83976147de4948a10f43379e Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Fri, 1 Feb 2013 14:15:53 -0500 Subject: [PATCH 6/7] vim: pub is just a plain old token keyword --- src/etc/vim/syntax/rust.vim | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index d04f09ad7233b..16ca8cf6d89b1 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -14,8 +14,7 @@ syn match rustAssert "\" +syn keyword rustKeyword loop match mod move once priv pub pure syn keyword rustKeyword ref return static syn keyword rustKeyword unsafe use while " FIXME: Scoped impl's name is also fallen in this category From dffc3f82b25dc8a5398ecb3a40bb7057cb2e7c5e Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Fri, 1 Feb 2013 19:32:03 -0500 Subject: [PATCH 7/7] vim: 'fail' is no longer a keyword --- 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 16ca8cf6d89b1..4ff7783888f8d 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -12,7 +12,7 @@ endif syn match rustAssert "\