rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Auto merge of #26061 - Gankro:inherit-dep, r=brson

Browse Source 
Uncertain if this is the desired effect/strategy/testing.

r? @aturon
This commit is contained in:
bors
2015-06-23 20:30:56 +00:00
parent 2ad26e850e 2962b2681f
commit 6fed735b22
5 changed files with 93 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libsyntax/attr.rs
View File

@@ -397,7 +397,7 @@ fn find_stability_generic<'a,
-> (Option<Stability>, Vec<&'a AM>) {
let mut stab: Option<Stability> = None;
let mut deprecated: Option<(InternedString, Option<InternedString>)> = None;
let mut deprecated: Option<(Option<InternedString>, Option<InternedString>)> = None;
let mut used_attrs: Vec<&'a AM> = vec![];
'outer: for attr in attrs {
@@ -484,7 +484,7 @@ fn find_stability_generic<'a,
diagnostic.span_err(item_sp, "multiple deprecated attributes");
}
deprecated = Some((since.unwrap_or(intern_and_get_ident("bogus")), reason));
deprecated = Some((since, reason));
}
}
@@ -493,7 +493,7 @@ fn find_stability_generic<'a,
match stab {
Some(ref mut s) => {
let (since, reason) = deprecated.unwrap();
s.deprecated_since = Some(since);
s.deprecated_since = since;
s.reason = reason;
}
None => {