diff options
Diffstat (limited to 'syntax/rust.vim')
| -rw-r--r-- | syntax/rust.vim | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/syntax/rust.vim b/syntax/rust.vim index d8330b84..6ee610d9 100644 --- a/syntax/rust.vim +++ b/syntax/rust.vim @@ -11,17 +11,6 @@ elseif exists("b:current_syntax") finish endif -" Fold settings {{{1 - -if has("folding") && exists('g:rust_fold') && g:rust_fold != 0 - setlocal foldmethod=syntax - if g:rust_fold == 2 - setlocal foldlevel< - else - setlocal foldlevel=99 - endif -endif - " Syntax definitions {{{1 " Basic keywords {{{2 syn keyword rustConditional match if else @@ -37,7 +26,7 @@ syn keyword rustKeyword fn nextgroup=rustFuncName skipwhite skipempty syn keyword rustKeyword for in if impl let syn keyword rustKeyword loop once proc pub syn keyword rustKeyword return super -syn keyword rustKeyword unsafe virtual while +syn keyword rustKeyword unsafe virtual where while syn keyword rustKeyword use nextgroup=rustModPath,rustModPathInUse skipwhite skipempty " FIXME: Scoped impl's name is also fallen in this category syn keyword rustKeyword mod trait struct enum type nextgroup=rustIdentifier skipwhite skipempty @@ -95,7 +84,7 @@ syn keyword rustEnumVariant Ok Err syn keyword rustTrait Ascii AsciiCast OwnedAsciiCast AsciiStr syn keyword rustTrait IntoBytes syn keyword rustTrait ToCStr -syn keyword rustTrait Char +syn keyword rustTrait Char UnicodeChar syn keyword rustTrait Clone syn keyword rustTrait PartialEq PartialOrd Eq Ord Equiv syn keyword rustEnum Ordering @@ -113,18 +102,18 @@ syn keyword rustTrait Box syn keyword rustTrait GenericPath Path PosixPath WindowsPath syn keyword rustTrait RawPtr syn keyword rustTrait Buffer Writer Reader Seek -syn keyword rustTrait Str StrVector StrSlice OwnedStr -syn keyword rustTrait IntoMaybeOwned StrAllocating +syn keyword rustTrait Str StrVector StrSlice +syn keyword rustTrait IntoMaybeOwned StrAllocating UnicodeStrSlice syn keyword rustTrait ToString IntoStr syn keyword rustTrait Tuple1 Tuple2 Tuple3 Tuple4 syn keyword rustTrait Tuple5 Tuple6 Tuple7 Tuple8 syn keyword rustTrait Tuple9 Tuple10 Tuple11 Tuple12 syn keyword rustTrait CloneableVector ImmutableCloneableVector -syn keyword rustTrait MutableCloneableVector MutableOrdVector -syn keyword rustTrait ImmutableVector MutableVector -syn keyword rustTrait ImmutableEqVector ImmutableOrdVector -syn keyword rustTrait Vector VectorVector -syn keyword rustTrait MutableVectorAllocating +syn keyword rustTrait MutableCloneableSlice MutableOrdSlice +syn keyword rustTrait ImmutableSlice MutableSlice +syn keyword rustTrait ImmutablePartialEqSlice ImmutableOrdSlice +syn keyword rustTrait Slice VectorVector +syn keyword rustTrait MutableSliceAllocating syn keyword rustTrait String syn keyword rustTrait Vec |