Skip to content

Commit 70581cf

Browse files
committed
---
yaml --- r: 192478 b: refs/heads/auto c: c5c3de0 h: refs/heads/master v: v3
1 parent 312b8af commit 70581cf

File tree

7 files changed

+4
-7
lines changed

7 files changed

+4
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 253992eb38569f7f80cc59537013b3d9d58aede6
13+
refs/heads/auto: c5c3de0cf4efba1517009ee6ef2da66f03b490b9
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc_back/lib.rs

Lines changed: 0 additions & 1 deletion
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)]

branches/auto/src/librustc_trans/lib.rs

Lines changed: 0 additions & 1 deletion
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

branches/auto/src/libstd/env.rs

Lines changed: 1 addition & 1 deletion
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 [""]));

branches/auto/src/libstd/lib.rs

Lines changed: 0 additions & 2 deletions
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)]

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

Lines changed: 1 addition & 0 deletions
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) {

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

Lines changed: 1 addition & 1 deletion
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)