diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2014-10-05 12:22:42 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2014-10-07 15:49:53 +1300 |
| commit | cd21e4a72c0175d226acc837d1886cfdfa40fe68 (patch) | |
| tree | b9860886daf57e5ce87e8863208e4ab0a3e947bb /src/libstd/path | |
| parent | 2d3823441fe5324f747f7bf51ffc07b9434f827f (diff) | |
| download | rust-cd21e4a72c0175d226acc837d1886cfdfa40fe68.tar.gz rust-cd21e4a72c0175d226acc837d1886cfdfa40fe68.zip | |
Rename slice::Slice
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 63c81695aff..6a122990246 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -76,7 +76,7 @@ use option::{Option, None, Some}; use str; use str::{MaybeOwned, Str, StrSlice}; use string::String; -use slice::{Slice, CloneableVector}; +use slice::{AsSlice, CloneableVector}; use slice::{ImmutablePartialEqSlice, ImmutableSlice}; use vec::Vec; diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 2425b40fef4..196ac7507ea 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, Slice, VectorVector, +use slice::{CloneableVector, Splits, AsSlice, VectorVector, ImmutablePartialEqSlice, 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: Slice<u8>+CloneableVector<u8>>(v: V) -> Vec<u8> { + fn normalize<V: AsSlice<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 803db4848ad..ec3f87bc45a 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::{Slice, ImmutableSlice}; +use slice::{AsSlice, ImmutableSlice}; use str::{CharSplits, Str, StrAllocating, StrVector, StrSlice}; use string::String; use unicode::char::UnicodeChar; |
