Separate the mir body lifetime from the other lifetimes · rust-lang/rust@8fc6b3d (original) (raw)

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

`

52

52

``

53

53

`pub(crate) fn report_error(

`

54

54

`&self,

`

55

``

`-

mbcx: &mut MirBorrowckCtxt<'_, '_, 'tcx>,

`

``

55

`+

mbcx: &mut MirBorrowckCtxt<'_, '_, '_, 'tcx>,

`

56

56

`placeholder: ty::PlaceholderRegion,

`

57

57

`error_element: RegionElement,

`

58

58

`cause: ObligationCause<'tcx>,

`

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

`

151

151

``

152

152

`fn nice_error(

`

153

153

`&self,

`

154

``

`-

mbcx: &mut MirBorrowckCtxt<'_, '_, 'tcx>,

`

``

154

`+

mbcx: &mut MirBorrowckCtxt<'_, '_, '_, 'tcx>,

`

155

155

`cause: ObligationCause<'tcx>,

`

156

156

`placeholder_region: ty::Region<'tcx>,

`

157

157

`error_region: Option<ty::Region<'tcx>>,

`

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

`

160

160

`#[instrument(level = "debug", skip(self, mbcx))]

`

161

161

`fn report_error(

`

162

162

`&self,

`

163

``

`-

mbcx: &mut MirBorrowckCtxt<'_, '_, 'tcx>,

`

``

163

`+

mbcx: &mut MirBorrowckCtxt<'_, '_, '_, 'tcx>,

`

164

164

`placeholder: ty::PlaceholderRegion,

`

165

165

`error_element: RegionElement,

`

166

166

`cause: ObligationCause<'tcx>,

`

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

`

233

233

``

234

234

`fn nice_error(

`

235

235

`&self,

`

236

``

`-

mbcx: &mut MirBorrowckCtxt<'_, '_, 'tcx>,

`

``

236

`+

mbcx: &mut MirBorrowckCtxt<'_, '_, '_, 'tcx>,

`

237

237

`cause: ObligationCause<'tcx>,

`

238

238

`placeholder_region: ty::Region<'tcx>,

`

239

239

`error_region: Option<ty::Region<'tcx>>,

`

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

`

270

270

``

271

271

`fn nice_error(

`

272

272

`&self,

`

273

``

`-

mbcx: &mut MirBorrowckCtxt<'_, '_, 'tcx>,

`

``

273

`+

mbcx: &mut MirBorrowckCtxt<'_, '_, '_, 'tcx>,

`

274

274

`cause: ObligationCause<'tcx>,

`

275

275

`placeholder_region: ty::Region<'tcx>,

`

276

276

`error_region: Option<ty::Region<'tcx>>,

`

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

`

310

310

``

311

311

`fn nice_error(

`

312

312

`&self,

`

313

``

`-

mbcx: &mut MirBorrowckCtxt<'_, '_, 'tcx>,

`

``

313

`+

mbcx: &mut MirBorrowckCtxt<'_, '_, '_, 'tcx>,

`

314

314

`cause: ObligationCause<'tcx>,

`

315

315

`placeholder_region: ty::Region<'tcx>,

`

316

316

`error_region: Option<ty::Region<'tcx>>,

`

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

`

336

336

``

337

337

`fn nice_error(

`

338

338

`&self,

`

339

``

`-

mbcx: &mut MirBorrowckCtxt<'_, '_, 'tcx>,

`

``

339

`+

mbcx: &mut MirBorrowckCtxt<'_, '_, '_, 'tcx>,

`

340

340

`_cause: ObligationCause<'tcx>,

`

341

341

`placeholder_region: ty::Region<'tcx>,

`

342

342

`error_region: Option<ty::Region<'tcx>>,

`