fixes after rebase

10 files changed, 2 insertions, 10 deletions

diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs
index 8f3c0a44835..b0906651da8 100644
--- a/src/libcore/iter.rs
+++ b/src/libcore/iter.rs
@@ -123,7 +123,6 @@ pub trait FromIterator<A> {
 }
 
 /// Conversion into an `Iterator`
-#[unstable]
 pub trait IntoIterator {
     type Iter: Iterator;
 
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index e99b203cce7..a38e8bb4536 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -41,7 +41,6 @@
 #![feature(unicode)]
 #![feature(hash)]
 #![cfg_attr(test, feature(test))]
-#![allow(unstable)]
 // NOTE(stage0) remove cfg_attr after a snapshot
 #![cfg_attr(not(stage0), allow(unused_mut))]
 
diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs
index 5a2ff926669..bee320c6829 100644
--- a/src/librustc_trans/lib.rs
+++ b/src/librustc_trans/lib.rs
@@ -41,7 +41,6 @@
 #![feature(std_misc)]
 #![feature(unicode)]
 #![feature(hash)]
-#![allow(unstable)]
 // NOTE(stage0) remove cfg_attr after a snapshot
 #![cfg_attr(not(stage0), allow(unused_mut))]
 
diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs
index 4772fac8bd4..98f997c5990 100644
--- a/src/librustc_typeck/lib.rs
+++ b/src/librustc_typeck/lib.rs
@@ -84,7 +84,6 @@ This API is completely unstable and subject to change.
 #![feature(core)]
 #![feature(rustc_private)]
 #![feature(std_misc)]
-#![allow(unstable)]
 // NOTE(stage0) remove cfg_attr after a snapshot
 #![cfg_attr(not(stage0), allow(unused_mut))]
 
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 974d8b96d32..4e811844ea9 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -32,7 +32,6 @@
 #![feature(test)]
 #![feature(unicode)]
 #![feature(hash)]
-#![allow(unstable)]
 // NOTE(stage0) remove cfg_attr after a snapshot
 #![cfg_attr(not(stage0), allow(unused_mut))]
 
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 534ece52ff5..54e2eaf16ee 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -123,7 +123,6 @@
 #![feature(rand)]
 #![feature(hash)]
 #![cfg_attr(test, feature(test))]
-#![allow(unstable)]
 // NOTE(stage0): remove cfg_attr after a snapshot
 #![cfg_attr(not(stage0), allow(unused_mut))]
 
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 456c6f73ce1..5b78d5b1405 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -39,7 +39,6 @@
 #![feature(rustc_private)]
 #![feature(std_misc)]
 #![feature(unicode)]
-#![allow(unstable)]
 // NOTE(stage0) remove cfg_attr after a snapshot
 #![cfg_attr(not(stage0), allow(unused_mut))]
 
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index af8d5b86f4b..4497832ba7e 100644
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -44,7 +44,6 @@
 #![feature(rustc_private)]
 #![feature(std_misc)]
 #![feature(hash)]
-#![allow(unstable)]
 // NOTE(stage0): remove cfg_attr after a snapshot
 #![cfg_attr(not(stage0), allow(unused_mut))]
 
diff --git a/src/test/compile-fail/issue-20605.rs b/src/test/compile-fail/issue-20605.rs
index 7b02588ce44..87b7616db8e 100644
--- a/src/test/compile-fail/issue-20605.rs
+++ b/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
diff --git a/src/test/compile-fail/issue-2150.rs b/src/test/compile-fail/issue-2150.rs
index 1a4c340aa95..68195985eec 100644
--- a/src/test/compile-fail/issue-2150.rs
+++ b/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;