diff options
| author | Virgile Andreani <virgile.andreani@anbuco.fr> | 2014-01-28 23:45:01 +0100 |
|---|---|---|
| committer | Virgile Andreani <virgile.andreani@anbuco.fr> | 2014-01-28 23:51:52 +0100 |
| commit | 2d60691eb7a7d2735837cadf05883b3abfcbc160 (patch) | |
| tree | a903f6d418968e7f00f8f9771d7c1a789ca846a9 /src/libstd | |
| parent | 0c081afabd8af8ddda708d0f2e8890d31d33d66f (diff) | |
| download | rust-2d60691eb7a7d2735837cadf05883b3abfcbc160.tar.gz rust-2d60691eb7a7d2735837cadf05883b3abfcbc160.zip | |
Rename CopyableTuple to CloneableTuple
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/prelude.rs | 2 | ||||
| -rw-r--r-- | src/libstd/str.rs | 2 | ||||
| -rw-r--r-- | src/libstd/tuple.rs | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index ee0bee058b6..c71dde3a101 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 21aa627b7c6..9cc9799d0c0 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 8e278aeb2ea..33d23df242c 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<T, U> { +pub trait CloneableTuple<T, U> { /// Return the first element of self fn first(&self) -> T; /// Return the second element of self @@ -26,7 +26,7 @@ pub trait CopyableTuple<T, U> { fn swap(&self) -> (U, T); } -impl<T:Clone,U:Clone> CopyableTuple<T, U> for (T, U) { +impl<T:Clone,U:Clone> CloneableTuple<T, U> for (T, U) { /// Return the first element of self #[inline] fn first(&self) -> T { |