fixes after rebase

src/test/compile-fail/issue-20605.rs

@@ -10,7 +10,7 @@
 
 fn changer<'a>(mut things: Box<Iterator<Item=&'a mut u8>>) {
     for item in *things { *item = 0 }
-//~^ ERROR the trait `core::marker::Sized` is not implemented for the type `core::iter::Iterator`
+//~^ ERROR the trait `core::marker::Sized` is not implemented for the type `core::iter::Iterator
 //~^^ ERROR
 //~^^^ ERROR
 // FIXME(#21528) error should be reported once, not thrice

src/test/compile-fail/issue-2150.rs

@@ -11,7 +11,7 @@
 #![deny(unreachable_code)]
 #![allow(unused_variables)]
 #![allow(dead_code)]
-#![allow(unstable)]
+#![feature(core)]
 
 fn fail_len(v: Vec<isize> ) -> usize {
     let mut i = 3;