diff options
| author | Ralf Jung <post@ralfj.de> | 2022-10-06 12:33:29 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2022-10-11 22:47:31 +0200 |
| commit | 2b50cd18772d3db523070d418dc0411b885a3ff4 (patch) | |
| tree | d7f1d8f99c343eef5f23e23a4441a26bd2d8ca01 /src | |
| parent | db0597f5619d5ed93feca28e61226d3581cc7867 (diff) | |
| download | rust-2b50cd18772d3db523070d418dc0411b885a3ff4.tar.gz rust-2b50cd18772d3db523070d418dc0411b885a3ff4.zip | |
rename rustc_allocator_nounwind to rustc_nounwind
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.rs | 4 | ||||
| -rw-r--r-- | src/tools/rust-analyzer/crates/hir-def/src/builtin_attr.rs | 2 |
2 files changed, 3 insertions, 3 deletions
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() } diff --git a/src/tools/rust-analyzer/crates/hir-def/src/builtin_attr.rs b/src/tools/rust-analyzer/crates/hir-def/src/builtin_attr.rs index 0e7ce5f85f9..39581b33a8d 100644 --- a/src/tools/rust-analyzer/crates/hir-def/src/builtin_attr.rs +++ b/src/tools/rust-analyzer/crates/hir-def/src/builtin_attr.rs @@ -379,7 +379,7 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[ // ========================================================================== rustc_attr!(rustc_allocator, Normal, template!(Word), WarnFollowing, IMPL_DETAIL), - rustc_attr!(rustc_allocator_nounwind, Normal, template!(Word), WarnFollowing, IMPL_DETAIL), + rustc_attr!(rustc_nounwind, Normal, template!(Word), WarnFollowing, IMPL_DETAIL), gated!( alloc_error_handler, Normal, template!(Word), WarnFollowing, experimental!(alloc_error_handler) |