|
3 | 3 | " Maintainer: Patrick Walton <[email protected]>
|
4 | 4 | " Maintainer: Ben Blum <[email protected]>
|
5 | 5 | " Maintainer: Chris Morgan <[email protected]>
|
6 |
| -" Last Change: July 18, 2014 |
| 6 | +" Last Change: January 5, 2015 |
7 | 7 |
|
8 | 8 | if version < 600
|
9 | 9 | syntax clear
|
@@ -68,59 +68,37 @@ syn keyword rustType f64 i8 i16 i32 i64 str Self
|
68 | 68 |
|
69 | 69 | " Reexported core operators {{{3
|
70 | 70 | syn keyword rustTrait Copy Send Sized Sync
|
71 |
| -syn keyword rustTrait Add Sub Mul Div Rem Neg Not |
72 |
| -syn keyword rustTrait BitAnd BitOr BitXor |
73 |
| -syn keyword rustTrait Drop Deref DerefMut |
74 |
| -syn keyword rustTrait Shl Shr |
75 |
| -syn keyword rustTrait Index IndexMut |
76 |
| -syn keyword rustTrait Slice SliceMut |
77 |
| -syn keyword rustTrait Fn FnMut FnOnce |
| 71 | +syn keyword rustTrait Drop Fn FnMut FnOnce |
78 | 72 |
|
79 | 73 | " Reexported functions {{{3
|
80 |
| -"syn keyword rustFunction range repeat |
81 |
| -"syn keyword rustFunction drop |
82 |
| -"syn keyword rustFunction from_str |
| 74 | +syn keyword rustFunction drop |
83 | 75 |
|
84 | 76 | " Reexported types and traits {{{3
|
85 |
| -syn keyword rustTrait Ascii AsciiCast OwnedAsciiCast AsciiStr |
86 |
| -syn keyword rustTrait IntoBytes |
87 |
| -syn keyword rustTrait ToCStr |
88 |
| -syn keyword rustTrait Char UnicodeChar |
| 77 | +syn keyword rustTrait Box |
| 78 | +syn keyword rustTrait CharExt |
89 | 79 | syn keyword rustTrait Clone
|
90 | 80 | syn keyword rustTrait PartialEq PartialOrd Eq Ord
|
91 |
| -syn keyword rustEnum Ordering Equiv |
92 |
| -syn keyword rustEnumVariant Less Equal Greater |
93 |
| -syn keyword rustTrait FromIterator Extend ExactSizeIterator |
94 |
| -syn keyword rustTrait Iterator DoubleEndedIterator |
95 |
| -syn keyword rustTrait RandomAccessIterator CloneableIterator |
96 |
| -syn keyword rustTrait OrdIterator MutableDoubleEndedIterator |
97 |
| -syn keyword rustTrait ToPrimitive FromPrimitive |
98 |
| -syn keyword rustTrait Box |
| 81 | +syn keyword rustTrait DoubleEndedIterator |
| 82 | +syn keyword rustTrait ExactSizeIterator |
| 83 | +syn keyword rustTrait Iterator IteratorExt Extend |
99 | 84 | syn keyword rustEnum Option
|
100 | 85 | syn keyword rustEnumVariant Some None
|
101 |
| -syn keyword rustTrait GenericPath Path PosixPath WindowsPath |
102 |
| -syn keyword rustTrait RawPtr RawMutPtr |
| 86 | +syn keyword rustTrait PtrExt MutPtrExt |
103 | 87 | syn keyword rustEnum Result
|
104 | 88 | syn keyword rustEnumVariant Ok Err
|
105 |
| -syn keyword rustTrait Buffer Writer Reader Seek BufferPrelude |
106 |
| -syn keyword rustTrait Str StrVector StrPrelude |
107 |
| -syn keyword rustTrait IntoMaybeOwned StrAllocating UnicodeStrPrelude |
108 |
| -syn keyword rustTrait Tuple1 Tuple2 Tuple3 Tuple4 |
109 |
| -syn keyword rustTrait Tuple5 Tuple6 Tuple7 Tuple8 |
110 |
| -syn keyword rustTrait Tuple9 Tuple10 Tuple11 Tuple12 |
111 |
| -syn keyword rustTrait SlicePrelude AsSlice CloneSlicePrelude |
112 |
| -syn keyword rustTrait VectorVector PartialEqSlicePrelude OrdSlicePrelude |
113 |
| -syn keyword rustTrait CloneSliceAllocPrelude OrdSliceAllocPrelude SliceAllocPrelude |
114 |
| -syn keyword rustTrait IntoString String ToString |
| 89 | +syn keyword rustTrait AsSlice |
| 90 | +syn keyword rustTrait SliceExt SliceConcatExt |
| 91 | +syn keyword rustTrait Str StrExt |
| 92 | +syn keyword rustTrait String ToString |
115 | 93 | syn keyword rustTrait Vec
|
116 |
| - |
117 |
| -" Reexported runtime types {{{3 |
118 |
| -"syn keyword rustFunction sync_channel channel |
119 |
| -syn keyword rustTrait SyncSender Sender Receiver |
120 |
| -"syn keyword rustFunction spawn |
| 94 | +" FIXME: remove when path reform lands |
| 95 | +syn keyword rustTrait Path GenericPath |
| 96 | +" FIXME: remove when I/O reform lands |
| 97 | +syn keyword rustTrait Buffer Writer Reader Seek BufferPrelude |
| 98 | +" FIXME: remove when range syntax lands |
| 99 | +syn keyword rustFunction range |
121 | 100 |
|
122 | 101 | " Other syntax {{{2
|
123 |
| - |
124 | 102 | syn keyword rustSelf self
|
125 | 103 | syn keyword rustBoolean true false
|
126 | 104 |
|
|
0 commit comments