about summary refs log tree commit diff
path: root/library/alloc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2025-09-27 12:39:02 +0000
committerbors <bors@rust-lang.org>2025-09-27 12:39:02 +0000
commitaa7859c0dec2de6c9cab34b03028bcef7b1fc25d (patch)
tree50431061df23ecbcd1b621b7f709f8fdd19a44a7 /library/alloc
parentbb624dcb4c8ab987e10c0808d92d76f3b84dd117 (diff)
parent186d91daf73188357d569b41906aa5f44a55dfba (diff)
downloadrust-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 'library/alloc')
-rw-r--r--library/alloc/src/alloc.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/library/alloc/src/alloc.rs b/library/alloc/src/alloc.rs
index 76630a746dd..c9b98fa4e5a 100644
--- a/library/alloc/src/alloc.rs
+++ b/library/alloc/src/alloc.rs
@@ -17,7 +17,6 @@ unsafe extern "Rust" {
     #[rustc_allocator]
     #[rustc_nounwind]
     #[rustc_std_internal_symbol]
-    #[rustc_allocator_zeroed_variant = "__rust_alloc_zeroed"]
     fn __rust_alloc(size: usize, align: usize) -> *mut u8;
     #[rustc_deallocator]
     #[rustc_nounwind]