diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-04-25 06:46:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-25 06:46:50 +0200 |
| commit | 2d72abc8f24d0af3b0344cbee14130eaaf90f75f (patch) | |
| tree | 66afe302b8efddeef9f8a787ab8c97f1e7d74102 /src | |
| parent | 2212354865ed06612db04afda3f245f1488302e4 (diff) | |
| parent | 23a363821de3276747b27754bd0dd03a32991187 (diff) | |
| download | rust-2d72abc8f24d0af3b0344cbee14130eaaf90f75f.tar.gz rust-2d72abc8f24d0af3b0344cbee14130eaaf90f75f.zip | |
Rollup merge of #110782 - matthiaskrgr:revert_panic_oom, r=Amanieu
Revert panic oom This temporarily reverts https://github.com/rust-lang/rust/pull/109507 until https://github.com/rust-lang/rust/issues/110771 is addressed r? `@Amanieu`
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/rust-analyzer/crates/hir-def/src/builtin_attr.rs | 4 |
1 files changed, 4 insertions, 0 deletions
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 e3e5fac98c0..f7c1e683d0d 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 @@ -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), ), |