Skip to content

Commit 6b0f4b5

Browse files
committedJun 24, 2024
Auto merge of #126914 - compiler-errors:rollup-zx0hchm, r=compiler-errors
Rollup of 11 pull requests Successful merges: - #124460 (Show notice about "never used" of Debug for enum) - #124712 (Deprecate no-op codegen option `-Cinline-threshold=...`) - #125082 (Remove `MaybeUninit::uninit_array()` and replace it with inline const blocks.) - #125575 (SmartPointer derive-macro) - #126413 (compiletest: make the crash test error message abit more informative) - #126673 (Ensure we don't accidentally succeed when we want to report an error) - #126682 (coverage: Overhaul validation of the `#[coverage(..)]` attribute) - #126899 (Suggest inline const blocks for array initialization) - #126904 (Small fixme in core now that NonZero is generic) - #126909 (add `@kobzol` to bootstrap team for triagebot) - #126911 (Split the lifetimes of `MirBorrowckCtxt`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents d8d5732 + 16bd6e2 commit 6b0f4b5

File tree

82 files changed

+1177
-571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+1177
-571
lines changed
 

‎compiler/rustc_borrowck/src/borrowck_errors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use rustc_middle::span_bug;
66
use rustc_middle::ty::{self, Ty, TyCtxt};
77
use rustc_span::Span;
88

9-
impl<'cx, 'tcx> crate::MirBorrowckCtxt<'cx, 'tcx> {
9+
impl<'tcx> crate::MirBorrowckCtxt<'_, '_, '_, 'tcx> {
1010
pub fn dcx(&self) -> DiagCtxtHandle<'tcx> {
1111
self.infcx.dcx()
1212
}

‎compiler/rustc_borrowck/src/diagnostics/bound_region_errors.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ impl<'tcx> UniverseInfo<'tcx> {
5252

5353
pub(crate) fn report_error(
5454
&self,
55-
mbcx: &mut MirBorrowckCtxt<'_, 'tcx>,
55+
mbcx: &mut MirBorrowckCtxt<'_, '_, '_, 'tcx>,
5656
placeholder: ty::PlaceholderRegion,
5757
error_element: RegionElement,
5858
cause: ObligationCause<'tcx>,
@@ -151,7 +151,7 @@ trait TypeOpInfo<'tcx> {
151151

152152
fn nice_error(
153153
&self,
154-
mbcx: &mut MirBorrowckCtxt<'_, 'tcx>,
154+
mbcx: &mut MirBorrowckCtxt<'_, '_, '_, 'tcx>,
155155
cause: ObligationCause<'tcx>,
156156
placeholder_region: ty::Region<'tcx>,
157157
error_region: Option<ty::Region<'tcx>>,
@@ -160,7 +160,7 @@ trait TypeOpInfo<'tcx> {
160160
#[instrument(level = "debug", skip(self, mbcx))]
161161
fn report_error(
162162
&self,
163-
mbcx: &mut MirBorrowckCtxt<'_, 'tcx>,
163+
mbcx: &mut MirBorrowckCtxt<'_, '_, '_, 'tcx>,
164164
placeholder: ty::PlaceholderRegion,
165165
error_element: RegionElement,
166166
cause: ObligationCause<'tcx>,
@@ -233,7 +233,7 @@ impl<'tcx> TypeOpInfo<'tcx> for PredicateQuery<'tcx> {
233233

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

271271
fn nice_error(
272272
&self,
273-
mbcx: &mut MirBorrowckCtxt<'_, 'tcx>,
273+
mbcx: &mut MirBorrowckCtxt<'_, '_, '_, 'tcx>,
274274
cause: ObligationCause<'tcx>,
275275
placeholder_region: ty::Region<'tcx>,
276276
error_region: Option<ty::Region<'tcx>>,
@@ -310,7 +310,7 @@ impl<'tcx> TypeOpInfo<'tcx> for AscribeUserTypeQuery<'tcx> {
310310

311311
fn nice_error(
312312
&self,
313-
mbcx: &mut MirBorrowckCtxt<'_, 'tcx>,
313+
mbcx: &mut MirBorrowckCtxt<'_, '_, '_, 'tcx>,
314314
cause: ObligationCause<'tcx>,
315315
placeholder_region: ty::Region<'tcx>,
316316
error_region: Option<ty::Region<'tcx>>,
@@ -336,7 +336,7 @@ impl<'tcx> TypeOpInfo<'tcx> for crate::type_check::InstantiateOpaqueType<'tcx> {
336336

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

0 commit comments

Comments
 (0)
Please sign in to comment.