Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 6b0f4b5

Browse files
committedJun 24, 2024
Auto merge of rust-lang#126914 - compiler-errors:rollup-zx0hchm, r=compiler-errors
Rollup of 11 pull requests Successful merges: - rust-lang#124460 (Show notice about "never used" of Debug for enum) - rust-lang#124712 (Deprecate no-op codegen option `-Cinline-threshold=...`) - rust-lang#125082 (Remove `MaybeUninit::uninit_array()` and replace it with inline const blocks.) - rust-lang#125575 (SmartPointer derive-macro) - rust-lang#126413 (compiletest: make the crash test error message abit more informative) - rust-lang#126673 (Ensure we don't accidentally succeed when we want to report an error) - rust-lang#126682 (coverage: Overhaul validation of the `#[coverage(..)]` attribute) - rust-lang#126899 (Suggest inline const blocks for array initialization) - rust-lang#126904 (Small fixme in core now that NonZero is generic) - rust-lang#126909 (add `@kobzol` to bootstrap team for triagebot) - rust-lang#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/diagnostics/region_errors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ pub struct ErrorConstraintInfo<'tcx> {
160160
pub(super) span: Span,
161161
}
162162

163-
impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
163+
impl<'tcx> MirBorrowckCtxt<'_, '_, '_, 'tcx> {
164164
/// Converts a region inference variable into a `ty::Region` that
165165
/// we can use for error reporting. If `r` is universally bound,
166166
/// then we use the name that we have on record for it. If `r` is

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ impl rustc_errors::IntoDiagArg for RegionName {
198198
}
199199
}
200200

201-
impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
201+
impl<'tcx> MirBorrowckCtxt<'_, '_, '_, 'tcx> {
202202
pub(crate) fn mir_def_id(&self) -> hir::def_id::LocalDefId {
203203
self.body.source.def_id().expect_local()
204204
}
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.