diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index b98680ae3ae3..47ac383e38c5 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -92,7 +92,7 @@ syn keyword rustTrait SendStr SendStrOwned SendStrStatic IntoSendStr syn keyword rustTrait Str StrVector StrSlice OwnedStr syn keyword rustTrait IterBytes syn keyword rustTrait ToStr IntoStr -syn keyword rustTrait CopyableTuple ImmutableTuple +syn keyword rustTrait CloneableTuple ImmutableTuple syn keyword rustTrait Tuple1 Tuple2 Tuple3 Tuple4 syn keyword rustTrait Tuple5 Tuple6 Tuple7 Tuple8 syn keyword rustTrait Tuple9 Tuple10 Tuple11 Tuple12 diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index ee0bee058b6b..c71dde3a101d 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -68,7 +68,7 @@ pub use send_str::{SendStr, SendStrOwned, SendStrStatic, IntoSendStr}; pub use str::{Str, StrVector, StrSlice, OwnedStr}; pub use to_bytes::IterBytes; pub use to_str::{ToStr, IntoStr}; -pub use tuple::{CopyableTuple, ImmutableTuple}; +pub use tuple::{CloneableTuple, ImmutableTuple}; pub use tuple::{ImmutableTuple1, ImmutableTuple2, ImmutableTuple3, ImmutableTuple4}; pub use tuple::{ImmutableTuple5, ImmutableTuple6, ImmutableTuple7, ImmutableTuple8}; pub use tuple::{ImmutableTuple9, ImmutableTuple10, ImmutableTuple11, ImmutableTuple12}; diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 21aa627b7c6d..9cc9799d0c01 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -594,7 +594,7 @@ impl<'a> Iterator<&'a str> for StrSplits<'a> { // Helper functions used for Unicode normalization fn canonical_sort(comb: &mut [(char, u8)]) { use iter::range; - use tuple::CopyableTuple; + use tuple::CloneableTuple; let len = comb.len(); for i in range(0, len) { diff --git a/src/libstd/tuple.rs b/src/libstd/tuple.rs index 8e278aeb2eab..33d23df242ce 100644 --- a/src/libstd/tuple.rs +++ b/src/libstd/tuple.rs @@ -17,7 +17,7 @@ use clone::Clone; #[cfg(not(test))] use default::Default; /// Method extensions to pairs where both types satisfy the `Clone` bound -pub trait CopyableTuple { +pub trait CloneableTuple { /// Return the first element of self fn first(&self) -> T; /// Return the second element of self @@ -26,7 +26,7 @@ pub trait CopyableTuple { fn swap(&self) -> (U, T); } -impl CopyableTuple for (T, U) { +impl CloneableTuple for (T, U) { /// Return the first element of self #[inline] fn first(&self) -> T {