Skip to content

Commit

Permalink
Auto merge of #125695 - RalfJung:fn_arg_sanity_check, r=jieyouxu
Browse files Browse the repository at this point in the history
fn_arg_sanity_check: fix panic message

The `\n` inside a raw string doesn't actually make a newline...
  • Loading branch information
bors committed May 29, 2024
2 parents 5870f1c + 92af72d commit 4cf5723
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion compiler/rustc_ty_utils/src/abi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,8 @@ fn fn_abi_sanity_check<'tcx>(
assert!(
matches!(&*cx.tcx.sess.target.arch, "wasm32" | "wasm64")
|| matches!(spec_abi, SpecAbi::PtxKernel | SpecAbi::Unadjusted),
r#"`PassMode::Direct` for aggregates only allowed for "unadjusted" and "ptx-kernel" functions and on wasm\nProblematic type: {:#?}"#,
"`PassMode::Direct` for aggregates only allowed for \"unadjusted\" and \"ptx-kernel\" functions and on wasm\n\
Problematic type: {:#?}",
arg.layout,
);
}
Expand Down
1 change: 1 addition & 0 deletions tests/ui/abi/compatibility.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
[nvptx64] needs-llvm-components: nvptx
*/
// FIXME: disabled since it fails on CI saying the csky component is missing
// see https://github.com/rust-lang/rust/issues/125697
/* revisions: csky
[csky] compile-flags: --target csky-unknown-linux-gnuabiv2
[csky] needs-llvm-components: csky
Expand Down

0 comments on commit 4cf5723

Please sign in to comment.