Do not force anonymous lifetimes in consts to be static.

This commit is contained in:
Camille GILLOT 2023-04-29 10:32:31 +00:00
parent 6ce22733b9
commit 63028ac3a1
2 changed files with 22 additions and 2 deletions

View File

@ -656,7 +656,7 @@ impl<'a: 'ast, 'ast, 'tcx> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast,
fn visit_anon_const(&mut self, constant: &'ast AnonConst) { fn visit_anon_const(&mut self, constant: &'ast AnonConst) {
// We deal with repeat expressions explicitly in `resolve_expr`. // We deal with repeat expressions explicitly in `resolve_expr`.
self.with_lifetime_rib(LifetimeRibKind::AnonConst, |this| { self.with_lifetime_rib(LifetimeRibKind::AnonConst, |this| {
this.with_lifetime_rib(LifetimeRibKind::Elided(LifetimeRes::Static), |this| { this.with_lifetime_rib(LifetimeRibKind::Elided(LifetimeRes::Infer), |this| {
this.resolve_anon_const(constant, IsRepeatExpr::No); this.resolve_anon_const(constant, IsRepeatExpr::No);
}) })
}) })
@ -4130,7 +4130,7 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
ExprKind::Repeat(ref elem, ref ct) => { ExprKind::Repeat(ref elem, ref ct) => {
self.visit_expr(elem); self.visit_expr(elem);
self.with_lifetime_rib(LifetimeRibKind::AnonConst, |this| { self.with_lifetime_rib(LifetimeRibKind::AnonConst, |this| {
this.with_lifetime_rib(LifetimeRibKind::Elided(LifetimeRes::Static), |this| { this.with_lifetime_rib(LifetimeRibKind::Elided(LifetimeRes::Infer), |this| {
this.resolve_anon_const(ct, IsRepeatExpr::Yes) this.resolve_anon_const(ct, IsRepeatExpr::Yes)
}) })
}); });

View File

@ -0,0 +1,20 @@
// Verify that elided lifetimes inside anonymous constants are not forced to be `'static`.
// check-pass
fn foo() -> [(); {
let a = 10_usize;
let b: &'_ usize = &a;
*b
}] {
[(); 10]
}
fn bar() -> [(); 10] {
[(); {
let a = 10_usize;
let b: &'_ usize = &a;
*b
}]
}
fn main() {}