Skip to content

Commit 54cdc75

Browse files
committedFeb 13, 2025
Auto merge of #136965 - jhpratt:rollup-bsnqvmf, r=jhpratt
Rollup of 8 pull requests Successful merges: - #134999 (Add cygwin target.) - #136559 (Resolve named regions when reporting type test failures in NLL) - #136660 (Use a trait to enforce field validity for union fields + `unsafe` fields + `unsafe<>` binder types) - #136858 (Parallel-compiler-related cleanup) - #136881 (cg_llvm: Reduce visibility of all functions in the llvm module) - #136888 (Always perform discr read for never pattern in EUV) - #136948 (Split out the `extern_system_varargs` feature) - #136949 (Fix import in bench for wasm) r? `@ghost` `@rustbot` modify labels: rollup
·
1.88.01.86.0
2 parents 3cb0272 + f9142b0 commit 54cdc75

File tree

71 files changed

+1232
-791
lines changed

Some content is hidden

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

71 files changed

+1232
-791
lines changed
 

‎compiler/rustc_abi/src/extern_abi.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ impl ExternAbi {
195195
// * C and Cdecl obviously support varargs.
196196
// * C can be based on Aapcs, SysV64 or Win64, so they must support varargs.
197197
// * EfiApi is based on Win64 or C, so it also supports it.
198-
// * System falls back to C for functions with varargs.
199198
//
200199
// * Stdcall does not, because it would be impossible for the callee to clean
201200
// up the arguments. (callee doesn't know how many arguments are there)
@@ -204,7 +203,6 @@ impl ExternAbi {
204203
match self {
205204
Self::C { .. }
206205
| Self::Cdecl { .. }
207-
| Self::System { .. }
208206
| Self::Aapcs { .. }
209207
| Self::Win64 { .. }
210208
| Self::SysV64 { .. }

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,13 +316,16 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
316316
let type_test_span = type_test.span;
317317

318318
if let Some(lower_bound_region) = lower_bound_region {
319-
let generic_ty = type_test.generic_kind.to_ty(self.infcx.tcx);
319+
let generic_ty = self.regioncx.name_regions(
320+
self.infcx.tcx,
321+
type_test.generic_kind.to_ty(self.infcx.tcx),
322+
);
320323
let origin = RelateParamBound(type_test_span, generic_ty, None);
321324
self.buffer_error(self.infcx.err_ctxt().construct_generic_bound_failure(
322325
self.body.source.def_id().expect_local(),
323326
type_test_span,
324327
Some(origin),
325-
type_test.generic_kind,
328+
self.regioncx.name_regions(self.infcx.tcx, type_test.generic_kind),
326329
lower_bound_region,
327330
));
328331
} else {

0 commit comments

Comments
 (0)
Please sign in to comment.