Skip to content

Commit 8a71b53

Browse files
committed
Rename CopyableVector to CloneableVector
1 parent c6bd053 commit 8a71b53

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

src/etc/vim/syntax/rust.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ syn keyword rustTrait ImmutableTuple5 ImmutableTuple6 ImmutableTuple7 ImmutableT
101101
syn keyword rustTrait ImmutableTuple9 ImmutableTuple10 ImmutableTuple11 ImmutableTuple12
102102
syn keyword rustTrait ImmutableEqVector ImmutableTotalOrdVector ImmutableCopyableVector
103103
syn keyword rustTrait OwnedVector OwnedCopyableVector OwnedEqVector MutableVector
104-
syn keyword rustTrait Vector VectorVector CopyableVector ImmutableVector
104+
syn keyword rustTrait Vector VectorVector CloneableVector ImmutableVector
105105

106106
"syn keyword rustFunction stream
107107
syn keyword rustTrait Port Chan GenericChan GenericSmartChan GenericPort Peekable

src/libstd/c_str.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ use ptr::RawPtr;
7272
use ptr;
7373
use str::StrSlice;
7474
use str;
75-
use vec::{CopyableVector, ImmutableVector, MutableVector};
75+
use vec::{CloneableVector, ImmutableVector, MutableVector};
7676
use vec;
7777
use unstable::intrinsics;
7878

src/libstd/io/comm_adapters.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use cmp;
1515
use io;
1616
use option::{None, Option, Some};
1717
use super::{Reader, Writer};
18-
use vec::{bytes, CopyableVector, MutableVector, ImmutableVector};
18+
use vec::{bytes, CloneableVector, MutableVector, ImmutableVector};
1919

2020
/// Allows reading from a port.
2121
///

src/libstd/num/strconv.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use option::{None, Option, Some};
1818
use char;
1919
use str::{StrSlice};
2020
use str;
21-
use vec::{CopyableVector, ImmutableVector, MutableVector};
21+
use vec::{CloneableVector, ImmutableVector, MutableVector};
2222
use vec::OwnedVector;
2323
use num;
2424
use num::{NumCast, Zero, One, cast, Integer};

src/libstd/path/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ use str;
7373
use str::{OwnedStr, Str, StrSlice};
7474
use to_str::ToStr;
7575
use vec;
76-
use vec::{CopyableVector, OwnedCopyableVector, OwnedVector, Vector};
76+
use vec::{CloneableVector, OwnedCopyableVector, OwnedVector, Vector};
7777
use vec::{ImmutableEqVector, ImmutableVector};
7878

7979
/// Typedef for POSIX file paths.

src/libstd/path/posix.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use str;
2121
use str::Str;
2222
use to_bytes::IterBytes;
2323
use vec;
24-
use vec::{CopyableVector, RevSplits, Splits, Vector, VectorVector,
24+
use vec::{CloneableVector, RevSplits, Splits, Vector, VectorVector,
2525
ImmutableEqVector, OwnedVector, ImmutableVector, OwnedCopyableVector};
2626
use super::{BytesContainer, GenericPath, GenericPathUnsafe};
2727

@@ -332,7 +332,7 @@ impl Path {
332332

333333
/// Returns a normalized byte vector representation of a path, by removing all empty
334334
/// components, and unnecessary . and .. components.
335-
fn normalize<V: Vector<u8>+CopyableVector<u8>>(v: V) -> ~[u8] {
335+
fn normalize<V: Vector<u8>+CloneableVector<u8>>(v: V) -> ~[u8] {
336336
// borrowck is being very picky
337337
let val = {
338338
let is_abs = !v.as_slice().is_empty() && v.as_slice()[0] == SEP_BYTE;

src/libstd/prelude.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ pub use tuple::{Tuple9, Tuple10, Tuple11, Tuple12};
7878
pub use vec::{ImmutableEqVector, ImmutableTotalOrdVector, ImmutableCopyableVector};
7979
pub use vec::{OwnedVector, OwnedCopyableVector,OwnedEqVector};
8080
pub use vec::{MutableVector, MutableTotalOrdVector};
81-
pub use vec::{Vector, VectorVector, CopyableVector, ImmutableVector};
81+
pub use vec::{Vector, VectorVector, CloneableVector, ImmutableVector};
8282

8383
// Reexported runtime types
8484
pub use comm::{Port, Chan, SharedChan};

src/libstd/vec.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -798,8 +798,8 @@ impl<T> Container for ~[T] {
798798
}
799799
}
800800

801-
/// Extension methods for vector slices with copyable elements
802-
pub trait CopyableVector<T> {
801+
/// Extension methods for vector slices with cloneable elements
802+
pub trait CloneableVector<T> {
803803
/// Copy `self` into a new owned vector
804804
fn to_owned(&self) -> ~[T];
805805

@@ -808,7 +808,7 @@ pub trait CopyableVector<T> {
808808
}
809809

810810
/// Extension methods for vector slices
811-
impl<'a, T: Clone> CopyableVector<T> for &'a [T] {
811+
impl<'a, T: Clone> CloneableVector<T> for &'a [T] {
812812
/// Returns a copy of `v`.
813813
#[inline]
814814
fn to_owned(&self) -> ~[T] {
@@ -824,7 +824,7 @@ impl<'a, T: Clone> CopyableVector<T> for &'a [T] {
824824
}
825825

826826
/// Extension methods for owned vectors
827-
impl<T: Clone> CopyableVector<T> for ~[T] {
827+
impl<T: Clone> CloneableVector<T> for ~[T] {
828828
#[inline]
829829
fn to_owned(&self) -> ~[T] { self.clone() }
830830

@@ -833,7 +833,7 @@ impl<T: Clone> CopyableVector<T> for ~[T] {
833833
}
834834

835835
/// Extension methods for managed vectors
836-
impl<T: Clone> CopyableVector<T> for @[T] {
836+
impl<T: Clone> CloneableVector<T> for @[T] {
837837
#[inline]
838838
fn to_owned(&self) -> ~[T] { self.as_slice().to_owned() }
839839

0 commit comments

Comments
 (0)