Separate the lifetimes of the `BorrowckInferCtxt` from the other borr…

Separate the lifetimes of the `BorrowckInferCtxt` from the other borr… · rust-lang/rust@1c4d0ce

@@ -52,7 +52,7 @@ impl<'tcx> UniverseInfo<'tcx> {

52525353pub(crate) fn report_error(5454&self,55-mbcx: &mut MirBorrowckCtxt<'_, 'tcx>,55+mbcx: &mut MirBorrowckCtxt<'_, '_, 'tcx>,5656placeholder: ty::PlaceholderRegion,5757error_element: RegionElement,5858cause: ObligationCause<'tcx>,

@@ -151,7 +151,7 @@ trait TypeOpInfo<'tcx> {

151151152152fn nice_error(153153&self,154-mbcx: &mut MirBorrowckCtxt<'_, 'tcx>,154+mbcx: &mut MirBorrowckCtxt<'_, '_, 'tcx>,155155cause: ObligationCause<'tcx>,156156placeholder_region: ty::Region<'tcx>,157157error_region: Option<ty::Region<'tcx>>,

@@ -160,7 +160,7 @@ trait TypeOpInfo<'tcx> {

160160#[instrument(level = "debug", skip(self, mbcx))]161161fn report_error(162162&self,163-mbcx: &mut MirBorrowckCtxt<'_, 'tcx>,163+mbcx: &mut MirBorrowckCtxt<'_, '_, 'tcx>,164164placeholder: ty::PlaceholderRegion,165165error_element: RegionElement,166166cause: ObligationCause<'tcx>,

@@ -233,7 +233,7 @@ impl<'tcx> TypeOpInfo<'tcx> for PredicateQuery<'tcx> {

233233234234fn nice_error(235235&self,236-mbcx: &mut MirBorrowckCtxt<'_, 'tcx>,236+mbcx: &mut MirBorrowckCtxt<'_, '_, 'tcx>,237237cause: ObligationCause<'tcx>,238238placeholder_region: ty::Region<'tcx>,239239error_region: Option<ty::Region<'tcx>>,

@@ -270,7 +270,7 @@ where

270270271271fn nice_error(272272&self,273-mbcx: &mut MirBorrowckCtxt<'_, 'tcx>,273+mbcx: &mut MirBorrowckCtxt<'_, '_, 'tcx>,274274cause: ObligationCause<'tcx>,275275placeholder_region: ty::Region<'tcx>,276276error_region: Option<ty::Region<'tcx>>,

@@ -310,7 +310,7 @@ impl<'tcx> TypeOpInfo<'tcx> for AscribeUserTypeQuery<'tcx> {

310310311311fn nice_error(312312&self,313-mbcx: &mut MirBorrowckCtxt<'_, 'tcx>,313+mbcx: &mut MirBorrowckCtxt<'_, '_, 'tcx>,314314cause: ObligationCause<'tcx>,315315placeholder_region: ty::Region<'tcx>,316316error_region: Option<ty::Region<'tcx>>,

@@ -336,7 +336,7 @@ impl<'tcx> TypeOpInfo<'tcx> for crate::type_check::InstantiateOpaqueType<'tcx> {

336336337337fn nice_error(338338&self,339-mbcx: &mut MirBorrowckCtxt<'_, 'tcx>,339+mbcx: &mut MirBorrowckCtxt<'_, '_, 'tcx>,340340_cause: ObligationCause<'tcx>,341341placeholder_region: ty::Region<'tcx>,342342error_region: Option<ty::Region<'tcx>>,