Skip to content

Commit 229338d

Browse files
committed
Update rust.vim for the latest prelude/keywords
1 parent badde74 commit 229338d

File tree

1 file changed

+23
-18
lines changed

1 file changed

+23
-18
lines changed

src/etc/vim/syntax/rust.vim

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ syn match rustFail "\<fail\(\w\)*!" contained
2121
syn keyword rustKeyword break box continue
2222
syn keyword rustKeyword extern nextgroup=rustExternCrate,rustObsoleteExternMod skipwhite
2323
syn keyword rustKeyword for in if impl let
24-
syn keyword rustKeyword loop once priv pub
25-
syn keyword rustKeyword return
26-
syn keyword rustKeyword unsafe while
24+
syn keyword rustKeyword loop once proc pub
25+
syn keyword rustKeyword return super
26+
syn keyword rustKeyword unsafe virtual while
2727
syn keyword rustKeyword use nextgroup=rustModPath skipwhite
2828
" FIXME: Scoped impl's name is also fallen in this category
2929
syn keyword rustKeyword mod trait struct enum type nextgroup=rustIdentifier skipwhite
3030
syn keyword rustKeyword fn nextgroup=rustFuncName skipwhite
31-
syn keyword rustKeyword proc
3231
syn keyword rustStorage mut ref static
3332
syn keyword rustObsoleteStorage const
3433

@@ -41,7 +40,7 @@ syn match rustIdentifier contains=rustIdentifierPrime "\%([^[:cntrl:][:spac
4140
syn match rustFuncName "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
4241

4342
" Reserved (but not yet used) keywords {{{2
44-
syn keyword rustReservedKeyword alignof be do offsetof pure sizeof typeof yield
43+
syn keyword rustReservedKeyword alignof be do offsetof priv pure sizeof typeof unsized yield
4544

4645
" Built-in types {{{2
4746
syn keyword rustType int uint float char bool u8 u16 u32 u64 f32
@@ -52,10 +51,10 @@ syn keyword rustType f64 i8 i16 i32 i64 str Self
5251
" to make it easy to update.
5352

5453
" Core operators {{{3
55-
syn keyword rustTrait Share Copy Send Sized
54+
syn keyword rustTrait Copy Send Sized Share
5655
syn keyword rustTrait Add Sub Mul Div Rem Neg Not
5756
syn keyword rustTrait BitAnd BitOr BitXor
58-
syn keyword rustTrait Drop
57+
syn keyword rustTrait Drop Deref DerefMut
5958
syn keyword rustTrait Shl Shr Index
6059
syn keyword rustEnum Option
6160
syn keyword rustEnumVariant Some None
@@ -68,7 +67,6 @@ syn keyword rustEnumVariant Ok Err
6867
"syn keyword rustFunction drop
6968

7069
" Types and traits {{{3
71-
syn keyword rustTrait Any AnyOwnExt AnyRefExt AnyMutRefExt
7270
syn keyword rustTrait Ascii AsciiCast OwnedAsciiCast AsciiStr IntoBytes
7371
syn keyword rustTrait ToCStr
7472
syn keyword rustTrait Char
@@ -80,25 +78,32 @@ syn keyword rustTrait FromIterator Extendable
8078
syn keyword rustTrait Iterator DoubleEndedIterator RandomAccessIterator CloneableIterator
8179
syn keyword rustTrait OrdIterator MutableDoubleEndedIterator ExactSize
8280
syn keyword rustTrait Num NumCast CheckedAdd CheckedSub CheckedMul
83-
syn keyword rustTrait Signed Unsigned Round
84-
syn keyword rustTrait Primitive Int Float ToPrimitive FromPrimitive
81+
syn keyword rustTrait Signed Unsigned
82+
syn keyword rustTrait Primitive Int Float FloatMath ToPrimitive FromPrimitive
83+
"syn keyword rustTrait Expect
84+
syn keyword rustTrait Box
8585
syn keyword rustTrait GenericPath Path PosixPath WindowsPath
8686
syn keyword rustTrait RawPtr
8787
syn keyword rustTrait Buffer Writer Reader Seek
88-
syn keyword rustTrait Str StrVector StrSlice OwnedStr IntoMaybeOwned StrBuf
88+
syn keyword rustTrait Str StrVector StrSlice OwnedStr IntoMaybeOwned
89+
syn keyword rustTrait StrAllocating
8990
syn keyword rustTrait ToStr IntoStr
9091
syn keyword rustTrait Tuple1 Tuple2 Tuple3 Tuple4
9192
syn keyword rustTrait Tuple5 Tuple6 Tuple7 Tuple8
9293
syn keyword rustTrait Tuple9 Tuple10 Tuple11 Tuple12
93-
syn keyword rustTrait ImmutableEqVector ImmutableTotalOrdVector ImmutableCloneableVector
94-
syn keyword rustTrait OwnedVector OwnedCloneableVector OwnedEqVector
95-
syn keyword rustTrait MutableVector MutableTotalOrdVector
96-
syn keyword rustTrait Vector VectorVector CloneableVector ImmutableVector
97-
98-
"syn keyword rustFunction stream
99-
syn keyword rustTrait Sender Receiver
94+
syn keyword rustTrait CloneableVector ImmutableCloneableVector MutableCloneableVector
95+
syn keyword rustTrait ImmutableVector MutableVector
96+
syn keyword rustTrait ImmutableEqVector ImmutableTotalOrdVector MutableTotalOrdVector
97+
syn keyword rustTrait Vector VectorVector OwnedVector MutableVectorAllocating
98+
syn keyword rustTrait StrBuf
99+
syn keyword rustTrait Vec
100+
101+
"syn keyword rustFunction sync_channel channel
102+
syn keyword rustTrait SyncSender Sender Receiver
100103
"syn keyword rustFunction spawn
101104

105+
"syn keyword rustConstant GC
106+
102107
syn keyword rustSelf self
103108
syn keyword rustBoolean true false
104109

0 commit comments

Comments
 (0)