Commit 5fdce89

cjgillotMark-Simulacrum

authored and

committed

Correct detection of elided lifetimes in impl-trait.

1 parent f099871 commit 5fdce89Copy full SHA for 5fdce89

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1195,8 +1195,10 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {`
`1195`	`1195`	`// Fresh lifetimes in APIT used to be allowed in async fns and forbidden in`
`1196`	`1196`	`// regular fns.`
`1197`	`1197`	`if let Some(hir::PredicateOrigin::ImplTrait) = where_bound_origin`
`1198`		`- && let hir::LifetimeName::Param(_) = lifetime_ref.res`
`1199`		`- && lifetime_ref.is_anonymous()`
	`1198`	`+ && let hir::LifetimeName::Param(param_id) = lifetime_ref.res`
	`1199`	`+ && let Some(generics) = self.tcx.hir().get_generics(self.tcx.local_parent(param_id))`
	`1200`	`+ && let Some(param) = generics.params.iter().find(\|p\| p.def_id == param_id)`
	`1201`	`+ && param.is_elided_lifetime()`
`1200`	`1202`	`&& let hir::IsAsync::NotAsync = self.tcx.asyncness(lifetime_ref.hir_id.owner.def_id)`
`1201`	`1203`	`&& !self.tcx.features().anonymous_lifetime_in_impl_trait`
`1202`	`1204`	`{`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,4 +60,9 @@ mod in_path {`
`60`	`60`	`//~\| ERROR missing lifetime specifier`
`61`	`61`	`}`
`62`	`62`
	`63`	+// This must not err, as the `&` actually resolves to `'a`.
	`64`	`+fn resolved_anonymous<'a, T>(f: impl Fn(&'a str) -> &T) {`
	`65`	`+ f("f")`
	`66`	`+}`
	`67`	`+`
`63`	`68`	`fn main() {}`

Comments

(0)