diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-12-11 09:44:17 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-12-14 19:03:56 -0800 |
| commit | 7741516a8bb206bf9357b70e12990a4dc1ba8169 (patch) | |
| tree | 4b50ad5a0d83241f97dc0b43aa1bca88226691fa /src/libstd/path | |
| parent | 126db549b038c84269a1e4fe46f051b2c15d6970 (diff) | |
| download | rust-7741516a8bb206bf9357b70e12990a4dc1ba8169.tar.gz rust-7741516a8bb206bf9357b70e12990a4dc1ba8169.zip | |
std: Collapse SlicePrelude traits
This commit collapses the various prelude traits for slices into just one trait: * SlicePrelude/SliceAllocPrelude => SliceExt * CloneSlicePrelude/CloneSliceAllocPrelude => CloneSliceExt * OrdSlicePrelude/OrdSliceAllocPrelude => OrdSliceExt * PartialEqSlicePrelude => PartialEqSliceExt
Diffstat (limited to 'src/libstd/path')
| -rw-r--r-- | src/libstd/path/mod.rs | 4 | ||||
| -rw-r--r-- | src/libstd/path/posix.rs | 4 | ||||
| -rw-r--r-- | src/libstd/path/windows.rs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index c7feff8705e..8f98329a4be 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -71,8 +71,8 @@ use option::Option::{None, Some}; use str; use str::{CowString, MaybeOwned, Str, StrPrelude}; use string::String; -use slice::{AsSlice, CloneSliceAllocPrelude}; -use slice::{PartialEqSlicePrelude, SlicePrelude}; +use slice::{AsSlice, CloneSliceExt}; +use slice::{PartialEqSliceExt, SliceExt}; use vec::Vec; /// Typedef for POSIX file paths. diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 4041a6f60d7..bea51712253 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -22,8 +22,8 @@ use option::Option::{None, Some}; use kinds::Sized; use str::{FromStr, Str}; use str; -use slice::{CloneSliceAllocPrelude, Splits, AsSlice, VectorVector, - PartialEqSlicePrelude, SlicePrelude}; +use slice::{CloneSliceExt, Splits, AsSlice, VectorVector, + PartialEqSliceExt, SliceExt}; use vec::Vec; use super::{BytesContainer, GenericPath, GenericPathUnsafe}; diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index 3983e365ae1..8b18d1d8cd4 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -26,7 +26,7 @@ use kinds::Copy; use mem; use option::Option; use option::Option::{Some, None}; -use slice::{AsSlice, SlicePrelude}; +use slice::{AsSlice, SliceExt}; use str::{CharSplits, FromStr, Str, StrAllocating, StrVector, StrPrelude}; use string::String; use unicode::char::UnicodeChar; |
