diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index 833cc616f7f19..b98680ae3ae3c 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -99,7 +99,7 @@ syn keyword rustTrait Tuple9 Tuple10 Tuple11 Tuple12 syn keyword rustTrait ImmutableTuple1 ImmutableTuple2 ImmutableTuple3 ImmutableTuple4 syn keyword rustTrait ImmutableTuple5 ImmutableTuple6 ImmutableTuple7 ImmutableTuple8 syn keyword rustTrait ImmutableTuple9 ImmutableTuple10 ImmutableTuple11 ImmutableTuple12 -syn keyword rustTrait ImmutableEqVector ImmutableTotalOrdVector ImmutableCopyableVector +syn keyword rustTrait ImmutableEqVector ImmutableTotalOrdVector ImmutableCloneableVector syn keyword rustTrait OwnedVector OwnedCloneableVector OwnedEqVector MutableVector syn keyword rustTrait Vector VectorVector CloneableVector ImmutableVector diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index 31e3edb70dff4..ee0bee058b6bf 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -75,7 +75,7 @@ pub use tuple::{ImmutableTuple9, ImmutableTuple10, ImmutableTuple11, ImmutableTu pub use tuple::{Tuple1, Tuple2, Tuple3, Tuple4}; pub use tuple::{Tuple5, Tuple6, Tuple7, Tuple8}; pub use tuple::{Tuple9, Tuple10, Tuple11, Tuple12}; -pub use vec::{ImmutableEqVector, ImmutableTotalOrdVector, ImmutableCopyableVector}; +pub use vec::{ImmutableEqVector, ImmutableTotalOrdVector, ImmutableCloneableVector}; pub use vec::{OwnedVector, OwnedCloneableVector,OwnedEqVector}; pub use vec::{MutableVector, MutableTotalOrdVector}; pub use vec::{Vector, VectorVector, CloneableVector, ImmutableVector}; diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index 589084ff8815d..467bcf075f60c 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -1261,7 +1261,7 @@ impl<'a, T: TotalOrd> ImmutableTotalOrdVector for &'a [T] { } /// Extension methods for vectors containing `Clone` elements. -pub trait ImmutableCopyableVector { +pub trait ImmutableCloneableVector { /** * Partitions the vector into those that satisfies the predicate, and * those that do not. @@ -1273,7 +1273,7 @@ pub trait ImmutableCopyableVector { fn permutations(self) -> Permutations; } -impl<'a,T:Clone> ImmutableCopyableVector for &'a [T] { +impl<'a,T:Clone> ImmutableCloneableVector for &'a [T] { #[inline] fn partitioned(&self, f: |&T| -> bool) -> (~[T], ~[T]) { let mut lefts = ~[];