about summary refs log tree commit diff
path: root/src/etc/vim/syntax/rust.vim
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-01-15 20:36:48 -0800
committerbors <bors@rust-lang.org>2014-01-15 20:36:48 -0800
commit6708558c341d0c4fd467636ee2b2695c125ae4d3 (patch)
tree749c0f4101e416ca51e7a454be00d6ed4f180baa /src/etc/vim/syntax/rust.vim
parentbf2ab22cd0eda8e019cb243916e6c127708739cf (diff)
parent1dd6906db2e6749bc3f113068e7493070b276feb (diff)
downloadrust-6708558c341d0c4fd467636ee2b2695c125ae4d3.tar.gz
rust-6708558c341d0c4fd467636ee2b2695c125ae4d3.zip
auto merge of #11548 : bjz/rust/bitwise, r=alexcrichton
One less trait in `std::num` and three less exported in the prelude.

cc. #10387
Diffstat (limited to 'src/etc/vim/syntax/rust.vim')
-rw-r--r--src/etc/vim/syntax/rust.vim3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim
index 65e7cd06149..fdb978ae7e1 100644
--- a/src/etc/vim/syntax/rust.vim
+++ b/src/etc/vim/syntax/rust.vim
@@ -83,8 +83,7 @@ syn keyword rustTrait OrdIterator MutableDoubleEndedIterator ExactSize
 syn keyword rustTrait Times
 
 syn keyword rustTrait Algebraic Trigonometric Exponential Hyperbolic
-syn keyword rustTrait Bitwise BitCount Bounded
-syn keyword rustTrait Integer Fractional Real RealExt
+syn keyword rustTrait Bitwise Bounded Integer Fractional Real RealExt
 syn keyword rustTrait Num NumCast CheckedAdd CheckedSub CheckedMul
 syn keyword rustTrait Orderable Signed Unsigned Round
 syn keyword rustTrait Primitive Int Float ToStrRadix ToPrimitive FromPrimitive