Skip to content

Commit 4cf5723

Browse files
committed
Auto merge of rust-lang#125695 - RalfJung:fn_arg_sanity_check, r=jieyouxu
fn_arg_sanity_check: fix panic message The `\n` inside a raw string doesn't actually make a newline...
2 parents 5870f1c + 92af72d commit 4cf5723

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

compiler/rustc_ty_utils/src/abi.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,8 @@ fn fn_abi_sanity_check<'tcx>(
520520
assert!(
521521
matches!(&*cx.tcx.sess.target.arch, "wasm32" | "wasm64")
522522
|| matches!(spec_abi, SpecAbi::PtxKernel | SpecAbi::Unadjusted),
523-
r#"`PassMode::Direct` for aggregates only allowed for "unadjusted" and "ptx-kernel" functions and on wasm\nProblematic type: {:#?}"#,
523+
"`PassMode::Direct` for aggregates only allowed for \"unadjusted\" and \"ptx-kernel\" functions and on wasm\n\
524+
Problematic type: {:#?}",
524525
arg.layout,
525526
);
526527
}

tests/ui/abi/compatibility.rs

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
[nvptx64] needs-llvm-components: nvptx
6060
*/
6161
// FIXME: disabled since it fails on CI saying the csky component is missing
62+
// see https://github.com/rust-lang/rust/issues/125697
6263
/* revisions: csky
6364
[csky] compile-flags: --target csky-unknown-linux-gnuabiv2
6465
[csky] needs-llvm-components: csky

0 commit comments

Comments
 (0)