From 836cdf0a02f6dc308cf69020c3397e0247ac047f Mon Sep 17 00:00:00 2001 From: Alexis Beingessner Date: Sat, 6 Jun 2015 15:52:28 -0700 Subject: [PATCH] WIP inherited deprecation fixes #26040 --- src/librustc/middle/stability.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/librustc/middle/stability.rs b/src/librustc/middle/stability.rs index b29e40d2d5e..5d092167d5a 100644 --- a/src/librustc/middle/stability.rs +++ b/src/librustc/middle/stability.rs @@ -60,8 +60,18 @@ fn annotate(&mut self, id: NodeId, use_parent: bool, if self.index.staged_api[&ast::LOCAL_CRATE] { debug!("annotate(id = {:?}, attrs = {:?})", id, attrs); match attr::find_stability(self.tcx.sess.diagnostic(), attrs, item_sp) { - Some(stab) => { + Some(mut stab) => { debug!("annotate: found {:?}", stab); + // if parent is deprecated and we're not, inherit this by merging + // deprecated_since and its reason. + if let Some(parent_stab) = self.parent { + if parent_stab.deprecated_since.is_some() + && stab.deprecated_since.is_none() { + stab.deprecated_since = parent_stab.deprecated_since.clone(); + stab.reason = parent_stab.reason.clone(); + } + } + let stab = self.tcx.intern_stability(stab); self.index.map.insert(local_def(id), Some(stab));