Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #110789 - matthiaskrgr:rollup-92e764u, r=matthiaskrgr
Rollup of 5 pull requests
Successful merges:
- #110563 (Break up long function in trait selection error reporting + clean up nearby code)
- #110755 ([LLVM17] Adapt to `ExplicitEmulatedTLS` removal.)
- #110775 (Update books)
- #110779 (configure.py: add flag for riscv{64,32}gc musl-root)
- #110782 (Revert panic oom)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
| -rw-r--r-- | crates/hir-def/src/builtin_attr.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crates/hir-def/src/builtin_attr.rs b/crates/hir-def/src/builtin_attr.rs index e3e5fac98c..f7c1e683d0 100644 --- a/crates/hir-def/src/builtin_attr.rs +++ b/crates/hir-def/src/builtin_attr.rs @@ -382,6 +382,10 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[ rustc_attr!(rustc_allocator, 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) + ), + gated!( default_lib_allocator, Normal, template!(Word), WarnFollowing, allocator_internals, experimental!(default_lib_allocator), ), |