Skip to content

Commit 650c8a2

Browse files
committed
bless test
1 parent 71c4b24 commit 650c8a2

8 files changed

+15
-15
lines changed

src/tools/miri/tests/fail/function_calls/check_callback_abi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fn main() {
99
// Make sure we check the ABI when Miri itself invokes a function
1010
// as part of a shim implementation.
1111
std::intrinsics::catch_unwind(
12-
//~^ ERROR: calling a function with calling convention C using calling convention Rust
12+
//~^ ERROR: calling a function with calling convention "C" using calling convention "Rust"
1313
std::mem::transmute::<extern "C" fn(*mut u8), _>(try_fn),
1414
std::ptr::null_mut(),
1515
|_, _| unreachable!(),

src/tools/miri/tests/fail/function_calls/check_callback_abi.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: Undefined Behavior: calling a function with calling convention C using calling convention Rust
1+
error: Undefined Behavior: calling a function with calling convention "C" using calling convention "Rust"
22
--> tests/fail/function_calls/check_callback_abi.rs:LL:CC
33
|
44
LL | / std::intrinsics::catch_unwind(
@@ -7,7 +7,7 @@ LL | | std::mem::transmute::<extern "C" fn(*mut u8), _>(try_fn),
77
LL | | std::ptr::null_mut(),
88
LL | | |_, _| unreachable!(),
99
LL | | );
10-
| |_________^ calling a function with calling convention C using calling convention Rust
10+
| |_________^ calling a function with calling convention "C" using calling convention "Rust"
1111
|
1212
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
1313
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information

src/tools/miri/tests/fail/function_calls/exported_symbol_abi_mismatch.cache.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error: Undefined Behavior: calling a function with calling convention Rust using calling convention C
1+
error: Undefined Behavior: calling a function with calling convention "Rust" using calling convention "C"
22
--> tests/fail/function_calls/exported_symbol_abi_mismatch.rs:LL:CC
33
|
44
LL | foo();
5-
| ^^^^^ calling a function with calling convention Rust using calling convention C
5+
| ^^^^^ calling a function with calling convention "Rust" using calling convention "C"
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information

src/tools/miri/tests/fail/function_calls/exported_symbol_abi_mismatch.fn_ptr.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error: Undefined Behavior: calling a function with calling convention Rust using calling convention C
1+
error: Undefined Behavior: calling a function with calling convention "Rust" using calling convention "C"
22
--> tests/fail/function_calls/exported_symbol_abi_mismatch.rs:LL:CC
33
|
44
LL | std::mem::transmute::<unsafe fn(), unsafe extern "C" fn()>(foo)();
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ calling a function with calling convention Rust using calling convention C
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ calling a function with calling convention "Rust" using calling convention "C"
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information

src/tools/miri/tests/fail/function_calls/exported_symbol_abi_mismatch.no_cache.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error: Undefined Behavior: calling a function with calling convention Rust using calling convention C
1+
error: Undefined Behavior: calling a function with calling convention "Rust" using calling convention "C"
22
--> tests/fail/function_calls/exported_symbol_abi_mismatch.rs:LL:CC
33
|
44
LL | foo();
5-
| ^^^^^ calling a function with calling convention Rust using calling convention C
5+
| ^^^^^ calling a function with calling convention "Rust" using calling convention "C"
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information

src/tools/miri/tests/fail/function_calls/exported_symbol_abi_mismatch.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fn main() {
1212
#[cfg(fn_ptr)]
1313
unsafe {
1414
std::mem::transmute::<unsafe fn(), unsafe extern "C" fn()>(foo)();
15-
//~[fn_ptr]^ ERROR: calling a function with calling convention Rust using calling convention C
15+
//~[fn_ptr]^ ERROR: calling a function with calling convention "Rust" using calling convention "C"
1616
}
1717

1818
// `Instance` caching should not suppress ABI check.
@@ -28,8 +28,8 @@ fn main() {
2828
}
2929
unsafe {
3030
foo();
31-
//~[no_cache]^ ERROR: calling a function with calling convention Rust using calling convention C
32-
//~[cache]| ERROR: calling a function with calling convention Rust using calling convention C
31+
//~[no_cache]^ ERROR: calling a function with calling convention "Rust" using calling convention "C"
32+
//~[cache]| ERROR: calling a function with calling convention "Rust" using calling convention "C"
3333
}
3434
}
3535
}

src/tools/miri/tests/fail/tail_calls/cc-mismatch.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@error-in-other-file: Undefined Behavior: calling a function with calling convention C using calling convention Rust
1+
//@error-in-other-file: Undefined Behavior: calling a function with calling convention "C" using calling convention "Rust"
22
#![feature(explicit_tail_calls)]
33
#![allow(incomplete_features)]
44

src/tools/miri/tests/fail/tail_calls/cc-mismatch.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error: Undefined Behavior: calling a function with calling convention C using calling convention Rust
1+
error: Undefined Behavior: calling a function with calling convention "C" using calling convention "Rust"
22
--> RUSTLIB/core/src/ops/function.rs:LL:CC
33
|
44
LL | extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ calling a function with calling convention C using calling convention Rust
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ calling a function with calling convention "C" using calling convention "Rust"
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information

0 commit comments

Comments
 (0)