diff options
| author | bors <bors@rust-lang.org> | 2014-01-29 17:01:39 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-29 17:01:39 -0800 |
| commit | 704f93ff5e8a8079af4a16fe984fb9f84b347d11 (patch) | |
| tree | c643c4ffb3c18a66be6181a2dbd6b795f9d36476 /src/libstd/path | |
| parent | f84b7291e7606b35e800070bd826e4c2e2154228 (diff) | |
| parent | 2d60691eb7a7d2735837cadf05883b3abfcbc160 (diff) | |
| download | rust-704f93ff5e8a8079af4a16fe984fb9f84b347d11.tar.gz rust-704f93ff5e8a8079af4a16fe984fb9f84b347d11.zip | |
auto merge of #11893 : Armavica/rust/copyable-cloneable, r=huonw
I found awkward to have `MutableCloneableVector` and `CloneableIterator` on the one hand, and `CopyableVector` etc. on the other hand. The concerned traits are: * `CopyableVector` --> `CloneableVector` * `OwnedCopyableVector` --> `OwnedCloneableVector` * `ImmutableCopyableVector` --> `ImmutableCloneableVector` * `CopyableTuple` --> `CloneableTuple`
Diffstat (limited to 'src/libstd/path')
| -rw-r--r-- | src/libstd/path/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/path/posix.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index 6464d6021ee..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::{CopyableVector, 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 8029ec696f8..707ba18378a 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -21,8 +21,8 @@ use str; use str::Str; use to_bytes::IterBytes; use vec; -use vec::{CopyableVector, RevSplits, Splits, Vector, VectorVector, - ImmutableEqVector, OwnedVector, ImmutableVector, OwnedCopyableVector}; +use vec::{CloneableVector, RevSplits, Splits, Vector, VectorVector, + ImmutableEqVector, OwnedVector, ImmutableVector, OwnedCloneableVector}; use super::{BytesContainer, GenericPath, GenericPathUnsafe}; /// Iterator that yields successive components of a Path as &[u8] @@ -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; |
