auto merge of #13161 : FlaPer87/rust/master, r=alexcrichton

This commit is contained in:
bors 2014-03-28 14:06:41 -07:00
commit cbfc0a5e33

View file

@ -52,7 +52,7 @@ syn keyword rustType f64 i8 i16 i32 i64 str Self
" to make it easy to update.
" Core operators {{{3
syn keyword rustTrait Freeze Copy Send Sized
syn keyword rustTrait Share Copy Send Sized
syn keyword rustTrait Add Sub Mul Div Rem Neg Not
syn keyword rustTrait BitAnd BitOr BitXor
syn keyword rustTrait Drop