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 4a0969e

Browse files
committedMay 5, 2025·
Auto merge of #140682 - GuillaumeGomez:rollup-6xjf6zn, r=GuillaumeGomez
Rollup of 11 pull requests Successful merges: - #140080 (mir-opt: Use one MirPatch in MatchBranchSimplification) - #140115 (mir-opt: execute MatchBranchSimplification after GVN) - #140357 (bypass linker configuration and cross target check on `x check`) - #140374 (Resolve instance for SymFn in global/naked asm) - #140559 (Removing rustc_type_ir in the rustc_infer codebase) - #140605 (`fn check_opaque_type_parameter_valid` defer error) - #140636 (implement `PanicTracker` to track `t` panics) - #140661 (Make `-Zfixed-x18` into a target modifier) - #140670 (calculate step duration in a panic-safe way) - #140672 (Deeply normalize in the new solver in WF) - #140676 (Update books) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 2e6882a + 2a882f7 commit 4a0969e

File tree

75 files changed

+520
-280
lines changed

Some content is hidden

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

75 files changed

+520
-280
lines changed
 

‎Cargo.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4515,6 +4515,7 @@ dependencies = [
45154515
"rustc_session",
45164516
"rustc_span",
45174517
"rustc_transmute",
4518+
"rustc_type_ir",
45184519
"smallvec",
45194520
"thin-vec",
45204521
"tracing",

‎compiler/rustc_borrowck/src/region_infer/opaque_types.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,13 +267,13 @@ impl<'tcx> InferCtxt<'tcx> {
267267
return Ty::new_error(self.tcx, e);
268268
}
269269

270-
if let Err(guar) = check_opaque_type_parameter_valid(
270+
if let Err(err) = check_opaque_type_parameter_valid(
271271
self,
272272
opaque_type_key,
273273
instantiated_ty.span,
274274
DefiningScopeKind::MirBorrowck,
275275
) {
276-
return Ty::new_error(self.tcx, guar);
276+
return Ty::new_error(self.tcx, err.report(self));
277277
}
278278

279279
let definition_ty = instantiated_ty

0 commit comments

Comments
 (0)
Please sign in to comment.