Skip to content

Commit af9f00d

Browse files
authored
Rollup merge of #110782 - matthiaskrgr:revert_panic_oom, r=Amanieu
Revert panic oom This temporarily reverts rust-lang/rust#109507 until rust-lang/rust#110771 is addressed r? `@Amanieu`
2 parents 6fcae0a + 4060877 commit af9f00d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

crates/hir-def/src/builtin_attr.rs

+4
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)