diff options
| author | Matthias Krüger <476013+matthiaskrgr@users.noreply.github.com> | 2025-05-17 15:45:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-17 15:45:19 +0200 |
| commit | 836db3ccae0b7cfb21a1da01c3f4bb6dea81daae (patch) | |
| tree | e9407f9748331664a4d56d8efc02e8d2933d2e92 /tests | |
| parent | a43b8d1d2b10bf4d9e9d935aed497f7ebbeeb6e4 (diff) | |
| parent | 41a2260bc7d7388a6ef2b0dfa7a980c977e26081 (diff) | |
| download | rust-836db3ccae0b7cfb21a1da01c3f4bb6dea81daae.tar.gz rust-836db3ccae0b7cfb21a1da01c3f4bb6dea81daae.zip | |
Rollup merge of #135808 - tiif:conv_display, r=workingjubilee
Implement Display for ``rustc_target::callconv::Conv`` Follow up of https://github.com/rust-lang/rust/pull/133103#discussion_r1885552854
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ui/consts/miri_unleashed/abi-mismatch.rs | 2 | ||||
| -rw-r--r-- | tests/ui/consts/miri_unleashed/abi-mismatch.stderr | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/ui/consts/miri_unleashed/abi-mismatch.rs b/tests/ui/consts/miri_unleashed/abi-mismatch.rs index 0a2b3f3abd6..6a46079b39b 100644 --- a/tests/ui/consts/miri_unleashed/abi-mismatch.rs +++ b/tests/ui/consts/miri_unleashed/abi-mismatch.rs @@ -10,7 +10,7 @@ const fn call_rust_fn(my_fn: extern "Rust" fn()) { static VAL: () = call_rust_fn(unsafe { std::mem::transmute(c_fn as extern "C" fn()) }); //~^ ERROR could not evaluate static initializer -//~| NOTE calling a function with calling convention C using calling convention Rust +//~| NOTE calling a function with calling convention "C" using calling convention "Rust" fn main() {} diff --git a/tests/ui/consts/miri_unleashed/abi-mismatch.stderr b/tests/ui/consts/miri_unleashed/abi-mismatch.stderr index 88623b134b0..7d1fdcce526 100644 --- a/tests/ui/consts/miri_unleashed/abi-mismatch.stderr +++ b/tests/ui/consts/miri_unleashed/abi-mismatch.stderr @@ -2,7 +2,7 @@ error[E0080]: could not evaluate static initializer --> $DIR/abi-mismatch.rs:11:18 | LL | static VAL: () = call_rust_fn(unsafe { std::mem::transmute(c_fn as extern "C" fn()) }); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ calling a function with calling convention C using calling convention Rust + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ calling a function with calling convention "C" using calling convention "Rust" | note: inside `call_rust_fn` --> $DIR/abi-mismatch.rs:7:5 |