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/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@ -13,7 +13,6 @@
 #![feature(box_syntax)]
 #![feature(collections)]
 #![feature(old_io)]
-#![feature(old_path)]
 #![feature(rustc_private)]
 #![feature(unboxed_closures)]
 #![feature(std_misc)]