X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Frustc_borrowck%2Fsrc%2Fregion_infer%2Fmod.rs;h=dabf61715ce58fb78bb4239dd40ab501932c061e;hb=05142a7e4495f09141fdd65f140fe44d8c200a9e;hp=20f54d04777603f626cccef71c2b6cb6f2f7740a;hpb=f1a677789ae12780fcc49fb449be8b336528b080;p=rust.git diff --git a/compiler/rustc_borrowck/src/region_infer/mod.rs b/compiler/rustc_borrowck/src/region_infer/mod.rs index 20f54d04777..dabf61715ce 100644 --- a/compiler/rustc_borrowck/src/region_infer/mod.rs +++ b/compiler/rustc_borrowck/src/region_infer/mod.rs @@ -45,6 +45,7 @@ pub mod values; pub struct RegionInferenceContext<'tcx> { + pub var_infos: VarInfos, /// Contains the definition for every region variable. Region /// variables are identified by their index (`RegionVid`). The /// definition contains information about where the region came @@ -267,7 +268,7 @@ pub(crate) fn new( ) -> Self { // Create a RegionDefinition for each inference variable. let definitions: IndexVec<_, _> = var_infos - .into_iter() + .iter() .map(|info| RegionDefinition::new(info.universe, info.origin)) .collect(); @@ -292,6 +293,7 @@ pub(crate) fn new( Rc::new(member_constraints_in.into_mapped(|r| constraint_sccs.scc(r))); let mut result = Self { + var_infos, definitions, liveness_constraints, constraints, @@ -787,7 +789,7 @@ fn universe_compatible(&self, scc_b: ConstraintSccIndex, scc_a: ConstraintSccInd let universe_a = self.scc_universes[scc_a]; // Quick check: if scc_b's declared universe is a subset of - // scc_a's declared univese (typically, both are ROOT), then + // scc_a's declared universe (typically, both are ROOT), then // it cannot contain any problematic universe elements. if universe_a.can_name(self.scc_universes[scc_b]) { return true; @@ -1991,7 +1993,7 @@ fn check_member_constraints( .iter() .find_map(|constraint| { if let ConstraintCategory::Predicate(predicate_span) = constraint.category { - // We currentl'y doesn't store the `DefId` in the `ConstraintCategory` + // We currently do not store the `DefId` in the `ConstraintCategory` // for performances reasons. The error reporting code used by NLL only // uses the span, so this doesn't cause any problems at the moment. Some(ObligationCauseCode::BindingObligation(