Skip to content

Commit

Permalink
Rollup merge of rust-lang#103608 - compiler-errors:rpitit-early-lt, r…
Browse files Browse the repository at this point in the history
…=cjgillot

Remap early bound lifetimes in return-position `impl Trait` in traits too

Fixes part of rust-lang#103457

r? `@cjgillot,` though feel free to reassign, just thought you'd have sufficient context to review.
  • Loading branch information
matthiaskrgr authored Oct 28, 2022
2 parents cfa2234 + b1cc95d commit e7fdac5
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
2 changes: 1 addition & 1 deletion compiler/rustc_hir_analysis/src/check/compare_method.rs
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ pub fn collect_trait_impl_trait_tys<'tcx>(
let num_trait_substs = trait_to_impl_substs.len();
let num_impl_substs = tcx.generics_of(impl_m.container_id(tcx)).params.len();
let ty = tcx.fold_regions(ty, |region, _| {
let ty::ReFree(_) = region.kind() else { return region; };
let (ty::ReFree(_) | ty::ReEarlyBound(_)) = region.kind() else { return region; };
let Some(ty::ReEarlyBound(e)) = map.get(&region.into()).map(|r| r.expect_region().kind())
else {
tcx
Expand Down
23 changes: 23 additions & 0 deletions src/test/ui/impl-trait/in-trait/early.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// check-pass
// edition:2021

#![feature(async_fn_in_trait, return_position_impl_trait_in_trait)]
#![allow(incomplete_features)]

pub trait Foo {
async fn bar<'a: 'a>(&'a mut self);
}

impl Foo for () {
async fn bar<'a: 'a>(&'a mut self) {}
}

pub trait Foo2 {
fn bar<'a: 'a>(&'a mut self) -> impl Sized + 'a;
}

impl Foo2 for () {
fn bar<'a: 'a>(&'a mut self) -> impl Sized + 'a {}
}

fn main() {}

0 comments on commit e7fdac5

Please sign in to comment.