diff options
| -rw-r--r-- | src/etc/vim/syntax/rust.vim | 2 | ||||
| -rw-r--r-- | src/libstd/c_str.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/comm_adapters.rs | 2 | ||||
| -rw-r--r-- | src/libstd/num/strconv.rs | 2 | ||||
| -rw-r--r-- | src/libstd/path/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/path/posix.rs | 4 | ||||
| -rw-r--r-- | src/libstd/prelude.rs | 2 | ||||
| -rw-r--r-- | 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 dbdb2949b93..c5c9524f0b3 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 22e93e58194..6e6aa9ad3fa 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 e15b9a861ca..cfe0bc6be87 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 30abe86866e..67f6d006b57 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 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<V: Vector<u8>+CopyableVector<u8>>(v: V) -> ~[u8] { + fn normalize<V: Vector<u8>+CloneableVector<u8>>(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 2f5f3e8f456..5422dace1dd 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 3cc05ee8228..9f6a40e879c 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -798,8 +798,8 @@ impl<T> Container for ~[T] { } } -/// Extension methods for vector slices with copyable elements -pub trait CopyableVector<T> { +/// Extension methods for vector slices with cloneable elements +pub trait CloneableVector<T> { /// Copy `self` into a new owned vector fn to_owned(&self) -> ~[T]; @@ -808,7 +808,7 @@ pub trait CopyableVector<T> { } /// Extension methods for vector slices -impl<'a, T: Clone> CopyableVector<T> for &'a [T] { +impl<'a, T: Clone> CloneableVector<T> for &'a [T] { /// Returns a copy of `v`. #[inline] fn to_owned(&self) -> ~[T] { @@ -824,7 +824,7 @@ impl<'a, T: Clone> CopyableVector<T> for &'a [T] { } /// Extension methods for owned vectors -impl<T: Clone> CopyableVector<T> for ~[T] { +impl<T: Clone> CloneableVector<T> for ~[T] { #[inline] fn to_owned(&self) -> ~[T] { self.clone() } @@ -833,7 +833,7 @@ impl<T: Clone> CopyableVector<T> for ~[T] { } /// Extension methods for managed vectors -impl<T: Clone> CopyableVector<T> for @[T] { +impl<T: Clone> CloneableVector<T> for @[T] { #[inline] fn to_owned(&self) -> ~[T] { self.as_slice().to_owned() } |