Skip to content

Commit c5c3de0

Browse files
committed
Test fixes and rebase conflicts, round 3
1 parent 253992e commit c5c3de0

File tree

6 files changed

+3
-6
lines changed

6 files changed

+3
-6
lines changed

src/librustc_back/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#![feature(collections)]
3737
#![feature(core)]
3838
#![feature(old_fs)]
39-
#![feature(hash)]
4039
#![feature(int_uint)]
4140
#![feature(io)]
4241
#![feature(old_io)]

src/librustc_trans/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#![feature(unicode)]
4141
#![feature(path_ext)]
4242
#![feature(fs)]
43-
#![feature(hash)]
4443
#![feature(convert)]
4544
#![feature(path_relative_from)]
4645

src/libstd/env.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ mod tests {
834834
fn split_paths_windows() {
835835
fn check_parse(unparsed: &str, parsed: &[&str]) -> bool {
836836
split_paths(unparsed).collect::<Vec<_>>() ==
837-
parsed.iter().map(|s| PathBuf::new(*s)).collect::<Vec<_>>()
837+
parsed.iter().map(|s| PathBuf::from(*s)).collect::<Vec<_>>()
838838
}
839839

840840
assert!(check_parse("", &mut [""]));

src/libstd/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@
111111
#![feature(box_syntax)]
112112
#![feature(collections)]
113113
#![feature(core)]
114-
#![feature(hash)]
115114
#![feature(lang_items)]
116115
#![feature(libc)]
117116
#![feature(linkage, thread_local, asm)]
@@ -124,7 +123,6 @@
124123
#![feature(unsafe_destructor)]
125124
#![feature(unsafe_no_drop_flag)]
126125
#![feature(macro_reexport)]
127-
#![feature(hash)]
128126
#![feature(int_uint)]
129127
#![feature(unique)]
130128
#![feature(convert)]

src/test/debuginfo/function-prologue-stepping-regular.rs

+1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
126126
// lldb-command:continue
127127

128128
#![allow(unused_variables)]
129+
#![feature(old_io)]
129130
#![omit_gdb_pretty_printer_section]
130131

131132
fn immediate_args(a: int, b: bool, c: f64) {

src/test/run-pass/out-of-stack-no-split.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
//ignore-dragonfly
1616
//ignore-bitrig
1717

18-
#![feature(asm)]
18+
#![feature(asm, old_io)]
1919

2020
use std::old_io::process::Command;
2121
use std::env;

0 commit comments

Comments
 (0)