Skip to content

Commit afc1064

Browse files
committed
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
2 parents 8041917 + af9f00d commit afc1064

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

crates/hir-def/src/builtin_attr.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,10 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[
381381

382382
rustc_attr!(rustc_allocator, Normal, template!(Word), WarnFollowing, IMPL_DETAIL),
383383
rustc_attr!(rustc_nounwind, Normal, template!(Word), WarnFollowing, IMPL_DETAIL),
384+
gated!(
385+
alloc_error_handler, Normal, template!(Word), WarnFollowing,
386+
experimental!(alloc_error_handler)
387+
),
384388
gated!(
385389
default_lib_allocator, Normal, template!(Word), WarnFollowing, allocator_internals,
386390
experimental!(default_lib_allocator),

0 commit comments

Comments
 (0)