Skip to content

Commit 2d60691

Browse files
committed
Rename CopyableTuple to CloneableTuple
1 parent 0c081af commit 2d60691

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/etc/vim/syntax/rust.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ syn keyword rustTrait SendStr SendStrOwned SendStrStatic IntoSendStr
9292
syn keyword rustTrait Str StrVector StrSlice OwnedStr
9393
syn keyword rustTrait IterBytes
9494
syn keyword rustTrait ToStr IntoStr
95-
syn keyword rustTrait CopyableTuple ImmutableTuple
95+
syn keyword rustTrait CloneableTuple ImmutableTuple
9696
syn keyword rustTrait Tuple1 Tuple2 Tuple3 Tuple4
9797
syn keyword rustTrait Tuple5 Tuple6 Tuple7 Tuple8
9898
syn keyword rustTrait Tuple9 Tuple10 Tuple11 Tuple12

src/libstd/prelude.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pub use send_str::{SendStr, SendStrOwned, SendStrStatic, IntoSendStr};
6868
pub use str::{Str, StrVector, StrSlice, OwnedStr};
6969
pub use to_bytes::IterBytes;
7070
pub use to_str::{ToStr, IntoStr};
71-
pub use tuple::{CopyableTuple, ImmutableTuple};
71+
pub use tuple::{CloneableTuple, ImmutableTuple};
7272
pub use tuple::{ImmutableTuple1, ImmutableTuple2, ImmutableTuple3, ImmutableTuple4};
7373
pub use tuple::{ImmutableTuple5, ImmutableTuple6, ImmutableTuple7, ImmutableTuple8};
7474
pub use tuple::{ImmutableTuple9, ImmutableTuple10, ImmutableTuple11, ImmutableTuple12};

src/libstd/str.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ impl<'a> Iterator<&'a str> for StrSplits<'a> {
594594
// Helper functions used for Unicode normalization
595595
fn canonical_sort(comb: &mut [(char, u8)]) {
596596
use iter::range;
597-
use tuple::CopyableTuple;
597+
use tuple::CloneableTuple;
598598

599599
let len = comb.len();
600600
for i in range(0, len) {

src/libstd/tuple.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use clone::Clone;
1717
#[cfg(not(test))] use default::Default;
1818

1919
/// Method extensions to pairs where both types satisfy the `Clone` bound
20-
pub trait CopyableTuple<T, U> {
20+
pub trait CloneableTuple<T, U> {
2121
/// Return the first element of self
2222
fn first(&self) -> T;
2323
/// Return the second element of self
@@ -26,7 +26,7 @@ pub trait CopyableTuple<T, U> {
2626
fn swap(&self) -> (U, T);
2727
}
2828

29-
impl<T:Clone,U:Clone> CopyableTuple<T, U> for (T, U) {
29+
impl<T:Clone,U:Clone> CloneableTuple<T, U> for (T, U) {
3030
/// Return the first element of self
3131
#[inline]
3232
fn first(&self) -> T {

0 commit comments

Comments
 (0)