From 8a71b53e6c05c41760a0d60d04aad6ab962be1c7 Mon Sep 17 00:00:00 2001 From: Virgile Andreani Date: Tue, 28 Jan 2014 19:40:38 +0100 Subject: [PATCH 1/4] Rename CopyableVector to CloneableVector --- src/etc/vim/syntax/rust.vim | 2 +- src/libstd/c_str.rs | 2 +- src/libstd/io/comm_adapters.rs | 2 +- src/libstd/num/strconv.rs | 2 +- src/libstd/path/mod.rs | 2 +- src/libstd/path/posix.rs | 4 ++-- src/libstd/prelude.rs | 2 +- src/libstd/vec.rs | 10 +++++----- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index dbdb2949b932a..c5c9524f0b35b 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -101,7 +101,7 @@ syn keyword rustTrait ImmutableTuple5 ImmutableTuple6 ImmutableTuple7 ImmutableT syn keyword rustTrait ImmutableTuple9 ImmutableTuple10 ImmutableTuple11 ImmutableTuple12 syn keyword rustTrait ImmutableEqVector ImmutableTotalOrdVector ImmutableCopyableVector syn keyword rustTrait OwnedVector OwnedCopyableVector OwnedEqVector MutableVector -syn keyword rustTrait Vector VectorVector CopyableVector ImmutableVector +syn keyword rustTrait Vector VectorVector CloneableVector ImmutableVector "syn keyword rustFunction stream syn keyword rustTrait Port Chan GenericChan GenericSmartChan GenericPort Peekable diff --git a/src/libstd/c_str.rs b/src/libstd/c_str.rs index 22e93e5819442..6e6aa9ad3faaf 100644 --- a/src/libstd/c_str.rs +++ b/src/libstd/c_str.rs @@ -72,7 +72,7 @@ use ptr::RawPtr; use ptr; use str::StrSlice; use str; -use vec::{CopyableVector, ImmutableVector, MutableVector}; +use vec::{CloneableVector, ImmutableVector, MutableVector}; use vec; use unstable::intrinsics; diff --git a/src/libstd/io/comm_adapters.rs b/src/libstd/io/comm_adapters.rs index e15b9a861ca1b..cfe0bc6be874b 100644 --- a/src/libstd/io/comm_adapters.rs +++ b/src/libstd/io/comm_adapters.rs @@ -15,7 +15,7 @@ use cmp; use io; use option::{None, Option, Some}; use super::{Reader, Writer}; -use vec::{bytes, CopyableVector, MutableVector, ImmutableVector}; +use vec::{bytes, CloneableVector, MutableVector, ImmutableVector}; /// Allows reading from a port. /// diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs index 30abe86866e22..67f6d006b5787 100644 --- a/src/libstd/num/strconv.rs +++ b/src/libstd/num/strconv.rs @@ -18,7 +18,7 @@ use option::{None, Option, Some}; use char; use str::{StrSlice}; use str; -use vec::{CopyableVector, ImmutableVector, MutableVector}; +use vec::{CloneableVector, ImmutableVector, MutableVector}; use vec::OwnedVector; use num; use num::{NumCast, Zero, One, cast, Integer}; diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index 6464d6021ee53..7c50ad7dfe3fe 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -73,7 +73,7 @@ use str; use str::{OwnedStr, Str, StrSlice}; use to_str::ToStr; use vec; -use vec::{CopyableVector, OwnedCopyableVector, OwnedVector, Vector}; +use vec::{CloneableVector, OwnedCopyableVector, OwnedVector, Vector}; use vec::{ImmutableEqVector, ImmutableVector}; /// Typedef for POSIX file paths. diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index e95bd2d8ca2f3..88cd5ab58c769 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -21,7 +21,7 @@ use str; use str::Str; use to_bytes::IterBytes; use vec; -use vec::{CopyableVector, RevSplits, Splits, Vector, VectorVector, +use vec::{CloneableVector, RevSplits, Splits, Vector, VectorVector, ImmutableEqVector, OwnedVector, ImmutableVector, OwnedCopyableVector}; use super::{BytesContainer, GenericPath, GenericPathUnsafe}; @@ -332,7 +332,7 @@ impl Path { /// Returns a normalized byte vector representation of a path, by removing all empty /// components, and unnecessary . and .. components. - fn normalize+CopyableVector>(v: V) -> ~[u8] { + fn normalize+CloneableVector>(v: V) -> ~[u8] { // borrowck is being very picky let val = { let is_abs = !v.as_slice().is_empty() && v.as_slice()[0] == SEP_BYTE; diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index 2f5f3e8f4568d..5422dace1dd1a 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -78,7 +78,7 @@ pub use tuple::{Tuple9, Tuple10, Tuple11, Tuple12}; pub use vec::{ImmutableEqVector, ImmutableTotalOrdVector, ImmutableCopyableVector}; pub use vec::{OwnedVector, OwnedCopyableVector,OwnedEqVector}; pub use vec::{MutableVector, MutableTotalOrdVector}; -pub use vec::{Vector, VectorVector, CopyableVector, ImmutableVector}; +pub use vec::{Vector, VectorVector, CloneableVector, ImmutableVector}; // Reexported runtime types pub use comm::{Port, Chan, SharedChan}; diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index 3cc05ee82282e..9f6a40e879c67 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -798,8 +798,8 @@ impl Container for ~[T] { } } -/// Extension methods for vector slices with copyable elements -pub trait CopyableVector { +/// Extension methods for vector slices with cloneable elements +pub trait CloneableVector { /// Copy `self` into a new owned vector fn to_owned(&self) -> ~[T]; @@ -808,7 +808,7 @@ pub trait CopyableVector { } /// Extension methods for vector slices -impl<'a, T: Clone> CopyableVector for &'a [T] { +impl<'a, T: Clone> CloneableVector for &'a [T] { /// Returns a copy of `v`. #[inline] fn to_owned(&self) -> ~[T] { @@ -824,7 +824,7 @@ impl<'a, T: Clone> CopyableVector for &'a [T] { } /// Extension methods for owned vectors -impl CopyableVector for ~[T] { +impl CloneableVector for ~[T] { #[inline] fn to_owned(&self) -> ~[T] { self.clone() } @@ -833,7 +833,7 @@ impl CopyableVector for ~[T] { } /// Extension methods for managed vectors -impl CopyableVector for @[T] { +impl CloneableVector for @[T] { #[inline] fn to_owned(&self) -> ~[T] { self.as_slice().to_owned() } From 86426015512b42ed29411c32af8292691df58031 Mon Sep 17 00:00:00 2001 From: Virgile Andreani Date: Tue, 28 Jan 2014 23:40:36 +0100 Subject: [PATCH 2/4] Rename OwnedCopyableVector to OwnedCloneableVector --- src/etc/vim/syntax/rust.vim | 2 +- src/libstd/io/mem.rs | 2 +- src/libstd/io/mod.rs | 2 +- src/libstd/path/mod.rs | 2 +- src/libstd/path/posix.rs | 2 +- src/libstd/prelude.rs | 2 +- src/libstd/str.rs | 2 +- src/libstd/vec.rs | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index c5c9524f0b35b..833cc616f7f19 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -100,7 +100,7 @@ syn keyword rustTrait ImmutableTuple1 ImmutableTuple2 ImmutableTuple3 ImmutableT syn keyword rustTrait ImmutableTuple5 ImmutableTuple6 ImmutableTuple7 ImmutableTuple8 syn keyword rustTrait ImmutableTuple9 ImmutableTuple10 ImmutableTuple11 ImmutableTuple12 syn keyword rustTrait ImmutableEqVector ImmutableTotalOrdVector ImmutableCopyableVector -syn keyword rustTrait OwnedVector OwnedCopyableVector OwnedEqVector MutableVector +syn keyword rustTrait OwnedVector OwnedCloneableVector OwnedEqVector MutableVector syn keyword rustTrait Vector VectorVector CloneableVector ImmutableVector "syn keyword rustFunction stream diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs index 6c380be343c88..c185951fecac8 100644 --- a/src/libstd/io/mem.rs +++ b/src/libstd/io/mem.rs @@ -17,7 +17,7 @@ use option::{Option, Some, None}; use super::{Reader, Writer, Seek, Buffer, IoError, SeekStyle, io_error, OtherIoError}; use vec; -use vec::{Vector, ImmutableVector, MutableVector, OwnedCopyableVector}; +use vec::{Vector, ImmutableVector, MutableVector, OwnedCloneableVector}; /// Writes to an owned, growable byte vector /// diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 8531edeb2c644..cadcbdd51f57b 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -302,7 +302,7 @@ use str::{StrSlice, OwnedStr}; use to_str::ToStr; use uint; use unstable::finally::Finally; -use vec::{OwnedVector, MutableVector, ImmutableVector, OwnedCopyableVector}; +use vec::{OwnedVector, MutableVector, ImmutableVector, OwnedCloneableVector}; use vec; // Reexports diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index 7c50ad7dfe3fe..11f23b22c51fa 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -73,7 +73,7 @@ use str; use str::{OwnedStr, Str, StrSlice}; use to_str::ToStr; use vec; -use vec::{CloneableVector, OwnedCopyableVector, OwnedVector, Vector}; +use vec::{CloneableVector, OwnedCloneableVector, OwnedVector, Vector}; use vec::{ImmutableEqVector, ImmutableVector}; /// Typedef for POSIX file paths. diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 88cd5ab58c769..e5e7d504e145b 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -22,7 +22,7 @@ use str::Str; use to_bytes::IterBytes; use vec; use vec::{CloneableVector, RevSplits, Splits, Vector, VectorVector, - ImmutableEqVector, OwnedVector, ImmutableVector, OwnedCopyableVector}; + ImmutableEqVector, OwnedVector, ImmutableVector, OwnedCloneableVector}; use super::{BytesContainer, GenericPath, GenericPathUnsafe}; /// Iterator that yields successive components of a Path as &[u8] diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index 5422dace1dd1a..31e3edb70dff4 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -76,7 +76,7 @@ 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::{OwnedVector, OwnedCopyableVector,OwnedEqVector}; +pub use vec::{OwnedVector, OwnedCloneableVector,OwnedEqVector}; pub use vec::{MutableVector, MutableTotalOrdVector}; pub use vec::{Vector, VectorVector, CloneableVector, ImmutableVector}; diff --git a/src/libstd/str.rs b/src/libstd/str.rs index c7626105f51ba..21aa627b7c6db 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -112,7 +112,7 @@ use to_str::ToStr; use from_str::FromStr; use uint; use vec; -use vec::{OwnedVector, OwnedCopyableVector, ImmutableVector, MutableVector}; +use vec::{OwnedVector, OwnedCloneableVector, ImmutableVector, MutableVector}; use default::Default; use send_str::{SendStr, SendStrOwned}; use unstable::raw::Repr; diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index 9f6a40e879c67..589084ff8815d 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -1698,7 +1698,7 @@ impl Mutable for ~[T] { } /// Extension methods for owned vectors containing `Clone` elements. -pub trait OwnedCopyableVector { +pub trait OwnedCloneableVector { /// Iterates over the slice `rhs`, copies each element, and then appends it to /// the vector provided `v`. The `rhs` vector is traversed in-order. /// @@ -1732,7 +1732,7 @@ pub trait OwnedCopyableVector { fn grow_set(&mut self, index: uint, initval: &T, val: T); } -impl OwnedCopyableVector for ~[T] { +impl OwnedCloneableVector for ~[T] { #[inline] fn push_all(&mut self, rhs: &[T]) { let new_len = self.len() + rhs.len(); From 0c081afabd8af8ddda708d0f2e8890d31d33d66f Mon Sep 17 00:00:00 2001 From: Virgile Andreani Date: Tue, 28 Jan 2014 23:42:40 +0100 Subject: [PATCH 3/4] Rename ImmutableCopyableVector to ImmutableCloneableVector --- src/etc/vim/syntax/rust.vim | 2 +- src/libstd/prelude.rs | 2 +- src/libstd/vec.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) 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 = ~[]; From 2d60691eb7a7d2735837cadf05883b3abfcbc160 Mon Sep 17 00:00:00 2001 From: Virgile Andreani Date: Tue, 28 Jan 2014 23:45:01 +0100 Subject: [PATCH 4/4] Rename CopyableTuple to CloneableTuple --- src/etc/vim/syntax/rust.vim | 2 +- src/libstd/prelude.rs | 2 +- src/libstd/str.rs | 2 +- src/libstd/tuple.rs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index b98680ae3ae3c..47ac383e38c58 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 ee0bee058b6bf..c71dde3a101d1 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 21aa627b7c6db..9cc9799d0c017 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 8e278aeb2eab5..33d23df242ce2 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 {