bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Add outlives_constraint to BlameConstraint

Browse source
This commit is contained in:
Jack Huey 2022-09-16 17:08:35 -04:00
parent 67653292be
commit ec17be2656
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs
View file

@ -310,11 +310,12 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
borrow_region: RegionVid, borrow_region: RegionVid,
outlived_region: RegionVid, outlived_region: RegionVid,
) -> (ConstraintCategory<'tcx>, bool, Span, Option<RegionName>) { ) -> (ConstraintCategory<'tcx>, bool, Span, Option<RegionName>) {
let BlameConstraint { category, from_closure, cause, variance_info: _ } = self let blame_constraint = self.regioncx.best_blame_constraint(
.regioncx borrow_region,
.best_blame_constraint(borrow_region, NllRegionVariableOrigin::FreeRegion, |r| { NllRegionVariableOrigin::FreeRegion,
self.regioncx.provides_universal_region(r, borrow_region, outlived_region) |r| self.regioncx.provides_universal_region(r, borrow_region, outlived_region),
}); );
let BlameConstraint { category, from_closure, cause, .. } = blame_constraint;
let outlived_fr_name = self.give_region_a_name(outlived_region); let outlived_fr_name = self.give_region_a_name(outlived_region);

2
compiler/rustc_borrowck/src/diagnostics/region_errors.rs
View file

@ -354,7 +354,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
) { ) {
debug!("report_region_error(fr={:?}, outlived_fr={:?})", fr, outlived_fr); debug!("report_region_error(fr={:?}, outlived_fr={:?})", fr, outlived_fr);
let BlameConstraint { category, cause, variance_info, from_closure: _ } = let BlameConstraint { category, cause, variance_info, .. } =
self.regioncx.best_blame_constraint(fr, fr_origin, |r| { self.regioncx.best_blame_constraint(fr, fr_origin, |r| {
self.regioncx.provides_universal_region(r, fr, outlived_fr) self.regioncx.provides_universal_region(r, fr, outlived_fr)
}); });

2
compiler/rustc_borrowck/src/region_infer/mod.rs
View file

@ -2073,6 +2073,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
from_closure, from_closure,
cause: ObligationCause::new(span, CRATE_HIR_ID, cause_code), cause: ObligationCause::new(span, CRATE_HIR_ID, cause_code),
variance_info: constraint.variance_info, variance_info: constraint.variance_info,
outlives_constraint: *constraint,
} }
}) })
.collect(); .collect();
@ -2328,4 +2329,5 @@ pub struct BlameConstraint<'tcx> {
pub from_closure: bool, pub from_closure: bool,
pub cause: ObligationCause<'tcx>, pub cause: ObligationCause<'tcx>,
pub variance_info: ty::VarianceDiagInfo<'tcx>, pub variance_info: ty::VarianceDiagInfo<'tcx>,
pub outlives_constraint: OutlivesConstraint<'tcx>,
} }