Auto merge of #24399 - brson:stab, r=nrc

src/librustc/middle/stability.rs

@@ -57,6 +57,7 @@ impl<'a> Annotator<'a> {
                    attrs: &Vec<Attribute>, item_sp: Span, f: F, required: bool) where
         F: FnOnce(&mut Annotator),
     {
+        if self.index.staged_api {
             debug!("annotate(id = {:?}, attrs = {:?})", id, attrs);
             match attr::find_stability(self.sess.diagnostic(), attrs, item_sp) {
                 Some(stab) => {
@@ -88,6 +89,19 @@ impl<'a> Annotator<'a> {
                     f(self);
                 }
             }
+        } else {
+            // Emit warnings for non-staged-api crates. These should be errors.
+            for attr in attrs {
+                let tag = attr.name();
+                if tag == "unstable" || tag == "stable" || tag == "deprecated" {
+                    attr::mark_used(attr);
+                    self.sess.span_warn(attr.span(),
+                                        "stability attributes are deprecated and \
+                                         will soon become errors");
+                }
+            }
+            f(self);
+        }
     }
 }
 
@@ -157,9 +171,6 @@ impl<'a, 'v> Visitor<'v> for Annotator<'a> {
 impl Index {
     /// Construct the stability index for a crate being compiled.
     pub fn build(&mut self, sess: &Session, krate: &Crate, export_map: &PublicItems) {
-        if !self.staged_api {
-            return;
-        }
         let mut annotator = Annotator {
             sess: sess,
             index: self,

src/test/compile-fail/stability-attribute-non-staged.rs

@@ -0,0 +1,18 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// These two generate an error to satisfy the compile-fail test
+#![deny(warnings)]
+#![feature(blah)] //~ ERROR
+
+#[unstable] //~ WARNING: stability attributes are deprecated
+#[stable] //~ WARNING: stability attributes are deprecated
+#[deprecated] //~ WARNING: stability attributes are deprecated
+fn main() { }