diff options
| author | Ralf Jung <post@ralfj.de> | 2022-10-12 19:53:57 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2022-10-12 19:53:57 +0200 |
| commit | 96737e3a52306192c23bf30b4108c568ec1f7701 (patch) | |
| tree | 70cd6e2159e920b8e7967675b8bc6152a5df1046 | |
| parent | e7785f6dfc1b1f46ca8c0bfe737d3d8b077fc9c0 (diff) | |
| parent | bf14e3196b4f340b5c2a57b902b01e07a7d7c3dc (diff) | |
| download | rust-96737e3a52306192c23bf30b4108c568ec1f7701.tar.gz rust-96737e3a52306192c23bf30b4108c568ec1f7701.zip | |
merge rustc history
| -rw-r--r-- | src/tools/miri/src/lib.rs | 1 | ||||
| -rw-r--r-- | src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.rs | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/tools/miri/src/lib.rs b/src/tools/miri/src/lib.rs index 904118eac78..8de0b0413a4 100644 --- a/src/tools/miri/src/lib.rs +++ b/src/tools/miri/src/lib.rs @@ -1,5 +1,4 @@ #![feature(rustc_private)] -#![feature(map_first_last)] #![feature(map_try_insert)] #![feature(never_type)] #![feature(try_blocks)] diff --git a/src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.rs b/src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.rs index d9aacdb8aea..f85ad5ae507 100644 --- a/src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.rs +++ b/src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.rs @@ -1,7 +1,7 @@ //@revisions: extern_block definition both #![feature(rustc_attrs, c_unwind)] -#[cfg_attr(any(definition, both), rustc_allocator_nounwind)] +#[cfg_attr(any(definition, both), rustc_nounwind)] #[no_mangle] extern "C-unwind" fn nounwind() { //[definition]~^ ERROR: abnormal termination: the program aborted execution @@ -11,7 +11,7 @@ extern "C-unwind" fn nounwind() { fn main() { extern "C-unwind" { - #[cfg_attr(any(extern_block, both), rustc_allocator_nounwind)] + #[cfg_attr(any(extern_block, both), rustc_nounwind)] fn nounwind(); } unsafe { nounwind() } |