diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-08-06 20:03:55 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-08-13 11:30:14 -0700 |
| commit | fbc93082ec92c3534c4b27fef35d78d97bd77fd2 (patch) | |
| tree | d5154fe0a4a461ce65f1dff659ac9117fb310e8d /src/libstd/path | |
| parent | 4f5b6927e8e428239082ecc17b85a0506bcc9a65 (diff) | |
| download | rust-fbc93082ec92c3534c4b27fef35d78d97bd77fd2.tar.gz rust-fbc93082ec92c3534c4b27fef35d78d97bd77fd2.zip | |
std: Rename slice::Vector to Slice
This required some contortions because importing both raw::Slice and slice::Slice makes rustc crash. Since `Slice` is in the prelude, this renaming is unlikely to casue breakage. [breaking-change]
Diffstat (limited to 'src/libstd/path')
| -rw-r--r-- | src/libstd/path/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/path/posix.rs | 4 | ||||
| -rw-r--r-- | src/libstd/path/windows.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index 087b3e4c53f..16236c01472 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -74,7 +74,7 @@ use option::{Option, None, Some}; use str; use str::{MaybeOwned, Str, StrSlice}; use string::String; -use slice::Vector; +use slice::Slice; use slice::{ImmutableEqSlice, ImmutableSlice}; use vec::Vec; diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 81abf3e7669..321ec438c20 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -21,7 +21,7 @@ use iter::{DoubleEndedIterator, AdditiveIterator, Extendable, Iterator, Map}; use option::{Option, None, Some}; use str::Str; use str; -use slice::{CloneableVector, Splits, Vector, VectorVector, +use slice::{CloneableVector, Splits, Slice, VectorVector, ImmutableEqSlice, ImmutableSlice}; use vec::Vec; @@ -367,7 +367,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>+CloneableVector<u8>>(v: V) -> Vec<u8> { + fn normalize<V: Slice<u8>+CloneableVector<u8>>(v: V) -> Vec<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/path/windows.rs b/src/libstd/path/windows.rs index ca8eae769bb..8402d751bf2 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -23,7 +23,7 @@ use io::Writer; use iter::{AdditiveIterator, DoubleEndedIterator, Extendable, Iterator, Map}; use mem; use option::{Option, Some, None}; -use slice::{Vector, ImmutableSlice}; +use slice::{Slice, ImmutableSlice}; use str::{CharSplits, Str, StrAllocating, StrVector, StrSlice}; use string::String; use unicode::char::UnicodeChar; |
