From 8a71b53e6c05c41760a0d60d04aad6ab962be1c7 Mon Sep 17 00:00:00 2001 From: Virgile Andreani Date: Tue, 28 Jan 2014 19:40:38 +0100 Subject: Rename CopyableVector to CloneableVector --- src/libstd/path/mod.rs | 2 +- src/libstd/path/posix.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libstd/path') diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index 6464d6021ee..7c50ad7dfe3 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 e95bd2d8ca2..88cd5ab58c7 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; -- cgit 1.4.1-3-g733a5 From 86426015512b42ed29411c32af8292691df58031 Mon Sep 17 00:00:00 2001 From: Virgile Andreani Date: Tue, 28 Jan 2014 23:40:36 +0100 Subject: 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(-) (limited to 'src/libstd/path') diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index c5c9524f0b3..833cc616f7f 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 6c380be343c..c185951feca 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 8531edeb2c6..cadcbdd51f5 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 7c50ad7dfe3..11f23b22c51 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 88cd5ab58c7..e5e7d504e14 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 5422dace1dd..31e3edb70df 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 c7626105f51..21aa627b7c6 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 9f6a40e879c..589084ff881 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(); -- cgit 1.4.1-3-g733a5