diff options
| author | Ralf Jung <post@ralfj.de> | 2024-02-25 18:51:22 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2024-02-26 11:10:18 +0100 |
| commit | b4ca582b8986c36d23726dc292c41b06fe7f9c6b (patch) | |
| tree | c20176a516e3ac88eb7e65b6c9a03d4721edc2ca /src/tools/miri/tests/fail | |
| parent | e9f95949138125bb1b98ed213a41b9aa825bacf5 (diff) | |
| download | rust-b4ca582b8986c36d23726dc292c41b06fe7f9c6b.tar.gz rust-b4ca582b8986c36d23726dc292c41b06fe7f9c6b.zip | |
rename 'try' intrinsic to 'catch_unwind'
Diffstat (limited to 'src/tools/miri/tests/fail')
| -rw-r--r-- | src/tools/miri/tests/fail/function_calls/check_callback_abi.rs | 2 | ||||
| -rw-r--r-- | src/tools/miri/tests/fail/function_calls/check_callback_abi.stderr | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/miri/tests/fail/function_calls/check_callback_abi.rs b/src/tools/miri/tests/fail/function_calls/check_callback_abi.rs index 883d5ae8096..fd667fbe454 100644 --- a/src/tools/miri/tests/fail/function_calls/check_callback_abi.rs +++ b/src/tools/miri/tests/fail/function_calls/check_callback_abi.rs @@ -8,7 +8,7 @@ fn main() { unsafe { // Make sure we check the ABI when Miri itself invokes a function // as part of a shim implementation. - std::intrinsics::r#try( + std::intrinsics::catch_unwind( //~^ ERROR: calling a function with ABI C using caller ABI Rust std::mem::transmute::<extern "C" fn(*mut u8), _>(try_fn), std::ptr::null_mut(), diff --git a/src/tools/miri/tests/fail/function_calls/check_callback_abi.stderr b/src/tools/miri/tests/fail/function_calls/check_callback_abi.stderr index f948d08bdbe..501f17c86d6 100644 --- a/src/tools/miri/tests/fail/function_calls/check_callback_abi.stderr +++ b/src/tools/miri/tests/fail/function_calls/check_callback_abi.stderr @@ -1,7 +1,7 @@ error: Undefined Behavior: calling a function with ABI C using caller ABI Rust --> $DIR/check_callback_abi.rs:LL:CC | -LL | / std::intrinsics::r#try( +LL | / std::intrinsics::catch_unwind( LL | | LL | | std::mem::transmute::<extern "C" fn(*mut u8), _>(try_fn), LL | | std::ptr::null_mut(), |