bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #121620 - nnethercote:fix-even-more-121208-fallout, r=lcnr

Browse source 
Fix more #121208 fallout (round 3)

#121208 converted lots of delayed bugs to bugs. Unsurprisingly, there were a few invalid conversion found via fuzzing.

r? `@lcnr`
This commit is contained in:
Guillaume Gomez 2024-02-26 10:27:43 +01:00 • committed by GitHub
commit 76f303d658
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 113 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs
View file

@ -1331,7 +1331,7 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
}
}
self.tcx.dcx().span_bug(
self.tcx.dcx().span_delayed_bug(
lifetime_ref.ident.span,
format!("Could not resolve {:?} in scope {:#?}", lifetime_ref, self.scope,),
);

3
compiler/rustc_hir_typeck/src/method/probe.rs
View file

@ -804,10 +804,11 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
let trait_ref = principal.with_self_ty(self.tcx, self_ty);
self.elaborate_bounds(iter::once(trait_ref), |this, new_trait_ref, item| {
if new_trait_ref.has_non_region_bound_vars() {
this.dcx().span_bug(
this.dcx().span_delayed_bug(
this.span,
"tried to select method from HRTB with non-lifetime bound vars",
);
return;
}
let new_trait_ref = this.instantiate_bound_regions_with_erased(new_trait_ref);