about summary refs log tree commit diff
path: root/src/etc/vim
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-11-08 21:06:37 +0000
committerbors <bors@rust-lang.org>2014-11-08 21:06:37 +0000
commitf0ca717c643cbef31859e443ee20db4465ac8864 (patch)
tree05190af84acccdfc795368a8e2431ab3f43038b5 /src/etc/vim
parentb80edf1d1257bf521fd9e62b732b6302258374e7 (diff)
parenta11f16739f08ec480263ba549d510fffc8ce557e (diff)
downloadrust-f0ca717c643cbef31859e443ee20db4465ac8864.tar.gz
rust-f0ca717c643cbef31859e443ee20db4465ac8864.zip
auto merge of #18475 : gamazeps/rust/toExtend, r=alexcrichton
Ensured that Extend & FromIterator are implemented for the libcollection.

Removed the fact that FromIterator had to be implemented in order to implement Extend, as it did not make sense for LruCache (it needs to be given a size and there are no Default for LruCache).

Changed the name from Extend to Extendable.

Part of #18424 
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 cec97a3ec88..25d3b4bf272 100644
--- a/src/etc/vim/syntax/rust.vim
+++ b/src/etc/vim/syntax/rust.vim
@@ -93,7 +93,7 @@ syn keyword rustEnum Ordering
 syn keyword rustEnumVariant Less Equal Greater
 syn keyword rustTrait Collection Mutable Map MutableMap MutableSeq
 syn keyword rustTrait Set MutableSet
-syn keyword rustTrait FromIterator Extendable ExactSize
+syn keyword rustTrait FromIterator IntoIterator Extend ExactSize
 syn keyword rustTrait Iterator DoubleEndedIterator
 syn keyword rustTrait RandomAccessIterator CloneableIterator
 syn keyword rustTrait OrdIterator MutableDoubleEndedIterator