diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2014-12-26 11:01:16 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2014-12-27 12:30:36 +1300 |
| commit | 4b92a5a229ebe7635851fc7bad94108f9de8dcc6 (patch) | |
| tree | a8008344fa0d47c27e882bc2942bcd95f50f985b /src/libstd/path | |
| parent | dbde7419cc120d97e520063682751dfc3a901fb5 (diff) | |
| download | rust-4b92a5a229ebe7635851fc7bad94108f9de8dcc6.tar.gz rust-4b92a5a229ebe7635851fc7bad94108f9de8dcc6.zip | |
Rebasing changes
Diffstat (limited to 'src/libstd/path')
| -rw-r--r-- | src/libstd/path/posix.rs | 4 | ||||
| -rw-r--r-- | src/libstd/path/windows.rs | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index c72e41d61c0..d941665f048 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -448,7 +448,9 @@ static dot_dot_static: &'static [u8] = b".."; #[cfg(test)] mod tests { use super::*; - use prelude::*; + use prelude::Option::{mod, Some, None}; + use prelude::{Vec, Clone, AsSlice, SliceExt, CloneSliceExt, IteratorExt}; + use prelude::{DoubleEndedIteratorExt, Str, StrExt, ToString, GenericPath}; use str; macro_rules! t { diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index 278908b8068..12da1752adf 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -1121,8 +1121,10 @@ fn prefix_len(p: Option<PathPrefix>) -> uint { #[cfg(test)] mod tests { - use mem; use super::*; + use prelude::Option::{mod, Some, None}; + use prelude::{Vec, Clone, AsSlice, SliceExt, CloneSliceExt, IteratorExt}; + use prelude::{DoubleEndedIteratorExt, Str, ToString, GenericPath}; use super::PathPrefix::*; use super::parse_prefix; |