about summary refs log tree commit diff
path: root/src/etc/vim
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-03-28 14:06:41 -0700
committerbors <bors@rust-lang.org>2014-03-28 14:06:41 -0700
commitcbfc0a5e33eb3d97a2995d120536b8dadc0cc0a2 (patch)
tree7a5fdf6a92f2ad9679693fc9a93f924eab5de511 /src/etc/vim
parent42e1003e4a2dd4d3a7e800c2f5b99bf77a4b635e (diff)
parent2e6607a1dd44aab097d0a3f9d7b1a418f6698602 (diff)
downloadrust-cbfc0a5e33eb3d97a2995d120536b8dadc0cc0a2.tar.gz
rust-cbfc0a5e33eb3d97a2995d120536b8dadc0cc0a2.zip
auto merge of #13161 : FlaPer87/rust/master, r=alexcrichton
Diffstat (limited to 'src/etc/vim')
-rw-r--r--src/etc/vim/syntax/rust.vim2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim
index 40250d66294..289a03042bd 100644
--- a/src/etc/vim/syntax/rust.vim
+++ b/src/etc/vim/syntax/rust.vim
@@ -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