diff options
| author | The rustc-dev-guide Cronjob Bot <github-actions@github.com> | 2025-05-01 04:05:49 +0000 |
|---|---|---|
| committer | The rustc-dev-guide Cronjob Bot <github-actions@github.com> | 2025-05-01 04:05:49 +0000 |
| commit | 560de7e51225559aa329d296f5ff0e9f95cbdf48 (patch) | |
| tree | e0389ca43c9774070bd6259df2f482f863e6a243 /library/std/src/alloc.rs | |
| parent | 27eb27423382738ae8f6d3d40a96396c7c541a37 (diff) | |
| parent | 0c33fe2c3d3eecadd17a84b110bb067288a64f1c (diff) | |
Merge from rustc
Diffstat (limited to 'library/std/src/alloc.rs')
| -rw-r--r-- | library/std/src/alloc.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/alloc.rs b/library/std/src/alloc.rs index 75971ac90e7..b574e9f3a25 100644 --- a/library/std/src/alloc.rs +++ b/library/std/src/alloc.rs @@ -57,7 +57,7 @@ #![stable(feature = "alloc_module", since = "1.28.0")] use core::ptr::NonNull; -use core::sync::atomic::{AtomicPtr, Ordering}; +use core::sync::atomic::{Atomic, AtomicPtr, Ordering}; use core::{hint, mem, ptr}; #[stable(feature = "alloc_module", since = "1.28.0")] @@ -287,7 +287,7 @@ unsafe impl Allocator for System { } } -static HOOK: AtomicPtr<()> = AtomicPtr::new(ptr::null_mut()); +static HOOK: Atomic<*mut ()> = AtomicPtr::new(ptr::null_mut()); /// Registers a custom allocation error hook, replacing any that was previously registered. /// |