Test fixes and rebase conflicts, round 2

2015-03-31 11:41:18 -07:00 · 2015-03-31 11:41:18 -07:00 · 30532884f8
commit 30532884f8
parent 554946c81e
15 changed files with 80 additions and 91 deletions
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@ -37,7 +37,6 @@
 #![feature(unsafe_destructor)]
 #![feature(staged_api)]
 #![feature(std_misc)]
-#![feature(io)]
 #![feature(path_ext)]
 #![feature(str_words)]
 #![feature(str_char)]