Do not treat lifetimes from parent items as influencing child items
This commit is contained in:
@@ -1833,7 +1833,7 @@ impl<'a, 'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
|
||||
}
|
||||
LifetimeRibKind::StaticIfNoLifetimeInScope { lint_id: node_id, emit_lint } => {
|
||||
let mut lifetimes_in_scope = vec![];
|
||||
for rib in &self.lifetime_ribs[..i] {
|
||||
for rib in self.lifetime_ribs[..i].iter().rev() {
|
||||
lifetimes_in_scope.extend(rib.bindings.iter().map(|(ident, _)| ident.span));
|
||||
// Consider any anonymous lifetimes, too
|
||||
if let LifetimeRibKind::AnonymousCreateParameter { binder, .. } = rib.kind
|
||||
@@ -1841,6 +1841,9 @@ impl<'a, 'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
|
||||
{
|
||||
lifetimes_in_scope.extend(extra.iter().map(|(ident, _, _)| ident.span));
|
||||
}
|
||||
if let LifetimeRibKind::Item = rib.kind {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if lifetimes_in_scope.is_empty() {
|
||||
self.record_lifetime_res(
|
||||
|
||||
@@ -17,4 +17,17 @@ impl Bar<'static> for B {
|
||||
const STATIC: &str = "";
|
||||
}
|
||||
|
||||
struct C;
|
||||
impl Bar<'_> for C {
|
||||
// make ^^ not cause
|
||||
const STATIC: &'static str = {
|
||||
struct B;
|
||||
impl Bar<'static> for B {
|
||||
const STATIC: &str = "";
|
||||
// ^ to emit a future incompat warning
|
||||
}
|
||||
""
|
||||
};
|
||||
}
|
||||
|
||||
fn main() {}
|
||||
|
||||
Reference in New Issue
Block a user