rollup merge of #23919: alexcrichton/stabilize-io-error

Conflicts: src/libstd/fs/tempdir.rs src/libstd/io/error.rs
2015-03-31 16:18:55 -07:00
parent 85e997adff ac77392f8a
commit 50b3ecf3bc
22 changed files with 108 additions and 72 deletions
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -34,7 +34,6 @@
 #![feature(unsafe_destructor)]
 #![feature(staged_api)]
 #![feature(exit_status)]
-#![feature(io)]
 #![feature(set_stdio)]
 #![feature(unicode)]