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 | |
| parent | 253992eb38569f7f80cc59537013b3d9d58aede6 (diff) | |
| download | rust-c5c3de0cf4efba1517009ee6ef2da66f03b490b9.tar.gz rust-c5c3de0cf4efba1517009ee6ef2da66f03b490b9.zip | |
Test fixes and rebase conflicts, round 3
| -rw-r--r-- | src/librustc_back/lib.rs | 1 | ||||
| -rw-r--r-- | src/librustc_trans/lib.rs | 1 | ||||
| -rw-r--r-- | src/libstd/env.rs | 2 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 2 | ||||
| -rw-r--r-- | src/test/debuginfo/function-prologue-stepping-regular.rs | 1 | ||||
| -rw-r--r-- | src/test/run-pass/out-of-stack-no-split.rs | 2 |
6 files changed, 3 insertions, 6 deletions
diff --git a/src/librustc_back/lib.rs b/src/librustc_back/lib.rs index 63727a573a3..f7ee76c0a43 100644 --- a/src/librustc_back/lib.rs +++ b/src/librustc_back/lib.rs @@ -36,7 +36,6 @@ #![feature(collections)] #![feature(core)] #![feature(old_fs)] -#![feature(hash)] #![feature(int_uint)] #![feature(io)] #![feature(old_io)] diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs index 176e3805a31..b9ec22b86f0 100644 --- a/src/librustc_trans/lib.rs +++ b/src/librustc_trans/lib.rs @@ -40,7 +40,6 @@ #![feature(unicode)] #![feature(path_ext)] #![feature(fs)] -#![feature(hash)] #![feature(convert)] #![feature(path_relative_from)] 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)] diff --git a/src/test/debuginfo/function-prologue-stepping-regular.rs b/src/test/debuginfo/function-prologue-stepping-regular.rs index 14433fbcd23..8312d16bcac 100644 --- a/src/test/debuginfo/function-prologue-stepping-regular.rs +++ b/src/test/debuginfo/function-prologue-stepping-regular.rs @@ -126,6 +126,7 @@ // lldb-command:continue #![allow(unused_variables)] +#![feature(old_io)] #![omit_gdb_pretty_printer_section] fn immediate_args(a: int, b: bool, c: f64) { diff --git a/src/test/run-pass/out-of-stack-no-split.rs b/src/test/run-pass/out-of-stack-no-split.rs index e4c7f4ef095..8887e1937c6 100644 --- a/src/test/run-pass/out-of-stack-no-split.rs +++ b/src/test/run-pass/out-of-stack-no-split.rs @@ -15,7 +15,7 @@ //ignore-dragonfly //ignore-bitrig -#![feature(asm)] +#![feature(asm, old_io)] use std::old_io::process::Command; use std::env; |