From 9758c488a94e77cc8a110a6783a99cf5b91326db Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 22 Jan 2015 12:33:46 -0800
Subject: Deprecated attributes don't take 'feature' names and are paired with
 stable/unstable

Conflicts:
	src/libcore/atomic.rs
	src/libcore/finally.rs
	src/test/auxiliary/inherited_stability.rs
	src/test/auxiliary/lint_stability.rs
---
 src/libsyntax/ext/base.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/libsyntax/ext')

diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
index cd04332b47f..bca7131fdb7 100644
--- a/src/libsyntax/ext/base.rs
+++ b/src/libsyntax/ext/base.rs
@@ -568,7 +568,8 @@ impl<'a> ExtCtxt<'a> {
         }
     }
 
-    #[deprecated(feature = "oldstuff", since = "1.0.0",
+    #[unstable(feature = "rustc_private")]
+    #[deprecated(since = "1.0.0",
                  reason = "Replaced with `expander().fold_expr()`")]
     pub fn expand_expr(&mut self, e: P<ast::Expr>) -> P<ast::Expr> {
         self.expander().fold_expr(e)
-- 
cgit 1.4.1-3-g733a5