diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-23 17:29:51 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-23 22:52:21 -0700 |
| commit | c5c3de0cf4efba1517009ee6ef2da66f03b490b9 (patch) | |
| tree | 2df766b7a0b3f338b8dbb15fe13da6c7da250a17 /src/libstd | |
| parent | 253992eb38569f7f80cc59537013b3d9d58aede6 (diff) | |
| download | rust-c5c3de0cf4efba1517009ee6ef2da66f03b490b9.tar.gz rust-c5c3de0cf4efba1517009ee6ef2da66f03b490b9.zip | |
Test fixes and rebase conflicts, round 3
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/env.rs | 2 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/libstd/env.rs b/src/libstd/env.rs index fd7532ea4a7..71f072302fb 100644 --- a/src/libstd/env.rs +++ b/src/libstd/env.rs @@ -834,7 +834,7 @@ mod tests { fn split_paths_windows() { fn check_parse(unparsed: &str, parsed: &[&str]) -> bool { split_paths(unparsed).collect::<Vec<_>>() == - parsed.iter().map(|s| PathBuf::new(*s)).collect::<Vec<_>>() + parsed.iter().map(|s| PathBuf::from(*s)).collect::<Vec<_>>() } assert!(check_parse("", &mut [""])); diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index f44256125cd..90eca6168f2 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -111,7 +111,6 @@ #![feature(box_syntax)] #![feature(collections)] #![feature(core)] -#![feature(hash)] #![feature(lang_items)] #![feature(libc)] #![feature(linkage, thread_local, asm)] @@ -124,7 +123,6 @@ #![feature(unsafe_destructor)] #![feature(unsafe_no_drop_flag)] #![feature(macro_reexport)] -#![feature(hash)] #![feature(int_uint)] #![feature(unique)] #![feature(convert)] |