mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP inherited deprecation fixes #26040

Browse Source
This commit is contained in:
Alexis Beingessner 2015-06-06 15:52:28 -07:00
parent c85f307369
commit 836cdf0a02
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/librustc/middle/stability.rs
View File

@ -60,8 +60,18 @@ fn annotate<F>(&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));