diff options
| author | bors <bors@rust-lang.org> | 2025-09-27 12:39:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-27 12:39:02 +0000 |
| commit | aa7859c0dec2de6c9cab34b03028bcef7b1fc25d (patch) | |
| tree | 50431061df23ecbcd1b621b7f709f8fdd19a44a7 /compiler/rustc_feature/src/builtin_attrs.rs | |
| parent | bb624dcb4c8ab987e10c0808d92d76f3b84dd117 (diff) | |
| parent | 186d91daf73188357d569b41906aa5f44a55dfba (diff) | |
| download | rust-beta.tar.gz rust-beta.zip | |
Auto merge of #147030 - nikic:revert-alloc-zeroed, r=wesleywiser beta
Revert "Auto merge of #144086 - clubby789:alloc-zeroed, r=nikic" This reverts commit 040a98af70f0a7da03f3d5356531b28a2a7a77e4, reversing changes made to e8a792daf500b5ff8097896ddb6cc037abe92487. This reverts https://github.com/rust-lang/rust/pull/144086 on beta due to https://github.com/rust-lang/rust/issues/145995. On master the issue will be fixed by https://github.com/rust-lang/rust/pull/146766.
Diffstat (limited to 'compiler/rustc_feature/src/builtin_attrs.rs')
| -rw-r--r-- | compiler/rustc_feature/src/builtin_attrs.rs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/compiler/rustc_feature/src/builtin_attrs.rs b/compiler/rustc_feature/src/builtin_attrs.rs index 129ab7eccb5..fe358bd1ecb 100644 --- a/compiler/rustc_feature/src/builtin_attrs.rs +++ b/compiler/rustc_feature/src/builtin_attrs.rs @@ -1001,10 +1001,6 @@ pub static BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[ rustc_allocator_zeroed, Normal, template!(Word), WarnFollowing, EncodeCrossCrate::No, ), - rustc_attr!( - rustc_allocator_zeroed_variant, Normal, template!(NameValueStr: "function"), ErrorPreceding, - EncodeCrossCrate::Yes, - ), gated!( default_lib_allocator, Normal, template!(Word), WarnFollowing, EncodeCrossCrate::No, allocator_internals, experimental!(default_lib_allocator), |