Test fixes and rebase conflicts, round 2

2015-03-27 13:22:26 -07:00 · 2015-03-27 13:22:26 -07:00 · d65fee28d3
commit d65fee28d3
parent 1c78478c12
6 changed files with 8 additions and 17 deletions
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@ -31,7 +31,6 @@
 #![feature(core)]
 #![feature(hash)]
 #![feature(libc)]
-#![feature(old_path)]
 #![feature(quote)]
 #![feature(rustc_diagnostic_macros)]
 #![feature(rustc_private)]