Skip to content

Commit 8642601

Browse files
committed
Rename OwnedCopyableVector to OwnedCloneableVector
1 parent 8a71b53 commit 8642601

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

src/etc/vim/syntax/rust.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ syn keyword rustTrait ImmutableTuple1 ImmutableTuple2 ImmutableTuple3 ImmutableT
100100
syn keyword rustTrait ImmutableTuple5 ImmutableTuple6 ImmutableTuple7 ImmutableTuple8
101101
syn keyword rustTrait ImmutableTuple9 ImmutableTuple10 ImmutableTuple11 ImmutableTuple12
102102
syn keyword rustTrait ImmutableEqVector ImmutableTotalOrdVector ImmutableCopyableVector
103-
syn keyword rustTrait OwnedVector OwnedCopyableVector OwnedEqVector MutableVector
103+
syn keyword rustTrait OwnedVector OwnedCloneableVector OwnedEqVector MutableVector
104104
syn keyword rustTrait Vector VectorVector CloneableVector ImmutableVector
105105

106106
"syn keyword rustFunction stream

src/libstd/io/mem.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use option::{Option, Some, None};
1717
use super::{Reader, Writer, Seek, Buffer, IoError, SeekStyle, io_error,
1818
OtherIoError};
1919
use vec;
20-
use vec::{Vector, ImmutableVector, MutableVector, OwnedCopyableVector};
20+
use vec::{Vector, ImmutableVector, MutableVector, OwnedCloneableVector};
2121

2222
/// Writes to an owned, growable byte vector
2323
///

src/libstd/io/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ use str::{StrSlice, OwnedStr};
302302
use to_str::ToStr;
303303
use uint;
304304
use unstable::finally::Finally;
305-
use vec::{OwnedVector, MutableVector, ImmutableVector, OwnedCopyableVector};
305+
use vec::{OwnedVector, MutableVector, ImmutableVector, OwnedCloneableVector};
306306
use vec;
307307

308308
// Reexports

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::{CloneableVector, OwnedCopyableVector, OwnedVector, Vector};
76+
use vec::{CloneableVector, OwnedCloneableVector, OwnedVector, Vector};
7777
use vec::{ImmutableEqVector, ImmutableVector};
7878

7979
/// Typedef for POSIX file paths.

src/libstd/path/posix.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use str::Str;
2222
use to_bytes::IterBytes;
2323
use vec;
2424
use vec::{CloneableVector, RevSplits, Splits, Vector, VectorVector,
25-
ImmutableEqVector, OwnedVector, ImmutableVector, OwnedCopyableVector};
25+
ImmutableEqVector, OwnedVector, ImmutableVector, OwnedCloneableVector};
2626
use super::{BytesContainer, GenericPath, GenericPathUnsafe};
2727

2828
/// Iterator that yields successive components of a Path as &[u8]

src/libstd/prelude.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ pub use tuple::{Tuple1, Tuple2, Tuple3, Tuple4};
7676
pub use tuple::{Tuple5, Tuple6, Tuple7, Tuple8};
7777
pub use tuple::{Tuple9, Tuple10, Tuple11, Tuple12};
7878
pub use vec::{ImmutableEqVector, ImmutableTotalOrdVector, ImmutableCopyableVector};
79-
pub use vec::{OwnedVector, OwnedCopyableVector,OwnedEqVector};
79+
pub use vec::{OwnedVector, OwnedCloneableVector,OwnedEqVector};
8080
pub use vec::{MutableVector, MutableTotalOrdVector};
8181
pub use vec::{Vector, VectorVector, CloneableVector, ImmutableVector};
8282

src/libstd/str.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ use to_str::ToStr;
112112
use from_str::FromStr;
113113
use uint;
114114
use vec;
115-
use vec::{OwnedVector, OwnedCopyableVector, ImmutableVector, MutableVector};
115+
use vec::{OwnedVector, OwnedCloneableVector, ImmutableVector, MutableVector};
116116
use default::Default;
117117
use send_str::{SendStr, SendStrOwned};
118118
use unstable::raw::Repr;

src/libstd/vec.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1698,7 +1698,7 @@ impl<T> Mutable for ~[T] {
16981698
}
16991699

17001700
/// Extension methods for owned vectors containing `Clone` elements.
1701-
pub trait OwnedCopyableVector<T:Clone> {
1701+
pub trait OwnedCloneableVector<T:Clone> {
17021702
/// Iterates over the slice `rhs`, copies each element, and then appends it to
17031703
/// the vector provided `v`. The `rhs` vector is traversed in-order.
17041704
///
@@ -1732,7 +1732,7 @@ pub trait OwnedCopyableVector<T:Clone> {
17321732
fn grow_set(&mut self, index: uint, initval: &T, val: T);
17331733
}
17341734

1735-
impl<T:Clone> OwnedCopyableVector<T> for ~[T] {
1735+
impl<T:Clone> OwnedCloneableVector<T> for ~[T] {
17361736
#[inline]
17371737
fn push_all(&mut self, rhs: &[T]) {
17381738
let new_len = self.len() + rhs.len();

0 commit comments

Comments
 (0)