diff options
| author | bors <bors@rust-lang.org> | 2014-11-22 10:46:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-11-22 10:46:40 +0000 |
| commit | acfdb14044bc5a8320536d19c381fb9c04420e3b (patch) | |
| tree | 486bd6242e1d0fc3517c58632881f9de79ebf198 /src/etc | |
| parent | 7765993d62b8f8653f79bfb8a2a8702f7ec19919 (diff) | |
| parent | dc0416ebce6b7a0266a4486b2b6eb83a710eaa32 (diff) | |
| download | rust-acfdb14044bc5a8320536d19c381fb9c04420e3b.tar.gz rust-acfdb14044bc5a8320536d19c381fb9c04420e3b.zip | |
auto merge of #19125 : chris-morgan/rust/vim-prelude-2014-11-20, r=alexcrichton
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/vim/syntax/rust.vim | 59 |
1 files changed, 27 insertions, 32 deletions
diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index 1b1b65bd560..0c7dcb8be7b 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -66,69 +66,64 @@ syn keyword rustType f64 i8 i16 i32 i64 str Self " This section is just straight transformation of the contents of the prelude, " to make it easy to update. -" Core operators {{{3 +" Reexported core operators {{{3 syn keyword rustTrait Copy Send Sized Sync syn keyword rustTrait Add Sub Mul Div Rem Neg Not syn keyword rustTrait BitAnd BitOr BitXor syn keyword rustTrait Drop Deref DerefMut -syn keyword rustTrait Shl Shr Index IndexMut -syn keyword rustEnum Option -syn keyword rustEnumVariant Some None -syn keyword rustEnum Result -syn keyword rustEnumVariant Ok Err +syn keyword rustTrait Shl Shr +syn keyword rustTrait Index IndexMut +syn keyword rustTrait Slice SliceMut +syn keyword rustTrait Fn FnMut FnOnce -" Functions {{{3 -"syn keyword rustFunction from_str -"syn keyword rustFunction range +" Reexported functions {{{3 +"syn keyword rustFunction range repeat "syn keyword rustFunction drop +"syn keyword rustFunction from_str -" Types and traits {{{3 +" Reexported types and traits {{{3 syn keyword rustTrait Ascii AsciiCast OwnedAsciiCast AsciiStr syn keyword rustTrait IntoBytes syn keyword rustTrait ToCStr syn keyword rustTrait Char UnicodeChar syn keyword rustTrait Clone -syn keyword rustTrait PartialEq PartialOrd Eq Ord Equiv -syn keyword rustEnum Ordering +syn keyword rustTrait PartialEq PartialOrd Eq Ord +syn keyword rustEnum Ordering Equiv syn keyword rustEnumVariant Less Equal Greater -syn keyword rustTrait Collection Mutable Map MutableMap MutableSeq -syn keyword rustTrait Set MutableSet -syn keyword rustTrait FromIterator IntoIterator Extend ExactSize +syn keyword rustTrait FromIterator Extend ExactSize syn keyword rustTrait Iterator DoubleEndedIterator syn keyword rustTrait RandomAccessIterator CloneableIterator syn keyword rustTrait OrdIterator MutableDoubleEndedIterator -syn keyword rustTrait NumCast Int SignedInt UnsignedInt Float -syn keyword rustTrait FloatMath ToPrimitive FromPrimitive +syn keyword rustTrait ToPrimitive FromPrimitive syn keyword rustTrait Box +syn keyword rustEnum Option +syn keyword rustEnumVariant Some None syn keyword rustTrait GenericPath Path PosixPath WindowsPath -syn keyword rustTrait RawPtr -syn keyword rustTrait Buffer Writer Reader Seek -syn keyword rustTrait Str StrVector StrSlice -syn keyword rustTrait IntoMaybeOwned StrAllocating UnicodeStrSlice -syn keyword rustTrait ToString IntoString +syn keyword rustTrait RawPtr RawMutPtr +syn keyword rustEnum Result +syn keyword rustEnumVariant Ok Err +syn keyword rustTrait Buffer Writer Reader Seek BufferPrelude +syn keyword rustTrait Str StrVector StrPrelude +syn keyword rustTrait IntoMaybeOwned StrAllocating UnicodeStrPrelude 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 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 SlicePrelude AsSlice CloneSlicePrelude +syn keyword rustTrait VectorVector PartialEqSlicePrelude OrdSlicePrelude +syn keyword rustTrait CloneSliceAllocPrelude OrdSliceAllocPrelude SliceAllocPrelude +syn keyword rustTrait IntoString String ToString syn keyword rustTrait Vec +" Reexported runtime types {{{3 "syn keyword rustFunction sync_channel channel syn keyword rustTrait SyncSender Sender Receiver "syn keyword rustFunction spawn -"syn keyword rustConstant GC +" Other syntax {{{2 syn keyword rustSelf self syn keyword rustBoolean true false -" Other syntax {{{2 - " If foo::bar changes to foo.bar, change this ("::" to "\."). " If foo::bar changes to Foo::bar, change this (first "\w" to "\u"). syn match rustModPath "\w\(\w\)*::[^<]"he=e-3,me=e-3 |