bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Remap impl-trait lifetimes on HIR instead of AST lowering.

Browse source
This commit is contained in:
Camille GILLOT 2024-08-20 00:48:43 +00:00
parent 298c7462c3
commit b6e1214ac0
35 changed files with 508 additions and 597 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_middle/src/ty/context.rs
View file

@ -3060,7 +3060,7 @@ impl<'tcx> TyCtxt<'tcx> {
loop {
let parent = self.local_parent(opaque_lifetime_param_def_id);
let hir::OpaqueTy { lifetime_mapping, .. } = self.hir().expect_opaque_ty(parent);
let lifetime_mapping = self.opaque_captured_lifetimes(parent);
let Some((lifetime, _)) = lifetime_mapping
.iter()
@ -3069,8 +3069,8 @@ impl<'tcx> TyCtxt<'tcx> {
bug!("duplicated lifetime param should be present");
};
match self.named_bound_var(lifetime.hir_id) {
Some(resolve_bound_vars::ResolvedArg::EarlyBound(ebv)) => {
match *lifetime {
resolve_bound_vars::ResolvedArg::EarlyBound(ebv) => {
let new_parent = self.local_parent(ebv);
// If we map to another opaque, then it should be a parent
@ -3089,7 +3089,7 @@ impl<'tcx> TyCtxt<'tcx> {
name: self.item_name(ebv.to_def_id()),
});
}
Some(resolve_bound_vars::ResolvedArg::LateBound(_, _, lbv)) => {
resolve_bound_vars::ResolvedArg::LateBound(_, _, lbv) => {
let new_parent = self.local_parent(lbv);
return ty::Region::new_late_param(
self,
@ -3100,13 +3100,13 @@ impl<'tcx> TyCtxt<'tcx> {
),
);
}
Some(resolve_bound_vars::ResolvedArg::Error(guar)) => {
resolve_bound_vars::ResolvedArg::Error(guar) => {
return ty::Region::new_error(self, guar);
}
_ => {
return ty::Region::new_error_with_message(
self,
lifetime.ident.span,
self.def_span(opaque_lifetime_param_def_id),
"cannot resolve lifetime",
);
}