Test fixes and rebase conflicts, round 2

2015-03-31 11:41:18 -07:00
parent 554946c81e
commit 30532884f8
15 changed files with 80 additions and 91 deletions
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -27,7 +27,6 @@

 #![feature(box_syntax)]
 #![feature(collections)]
-#![feature(core)]
 #![feature(libc)]
 #![feature(quote)]
 #![feature(rustc_diagnostic_macros)]