Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-10 20:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #110789 - matthiaskrgr:rollup-92e764u, r=matthiaskrgr

Browse source 
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
This commit is contained in:
bors 2023-04-25 04:58:54 +00:00
commit afc10646d2
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/hir-def/src/builtin_attr.rs
View file

@ -381,6 +381,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),