diff options
| author | Laurențiu Nicola <lnicola@dend.ro> | 2025-05-01 10:22:16 +0300 |
|---|---|---|
| committer | Laurențiu Nicola <lnicola@dend.ro> | 2025-05-01 10:22:16 +0300 |
| commit | 1c5de64814d72effc6890ca823fa4d248041a0bd (patch) | |
| tree | 9375885343e27ab26b20dfe5a3714e00d5d378d0 /library/std/src/sys/alloc/xous.rs | |
| parent | b01b98f9f0b350badf8390e7950759d78484622d (diff) | |
| parent | 6e23095adf9209614a45f7f75fea36dad7b92afb (diff) | |
Merge from rust-lang/rust
Diffstat (limited to 'library/std/src/sys/alloc/xous.rs')
| -rw-r--r-- | library/std/src/sys/alloc/xous.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/sys/alloc/xous.rs b/library/std/src/sys/alloc/xous.rs index ccaa972c22d..c7f973b8027 100644 --- a/library/std/src/sys/alloc/xous.rs +++ b/library/std/src/sys/alloc/xous.rs @@ -49,10 +49,10 @@ unsafe impl GlobalAlloc for System { } mod lock { - use crate::sync::atomic::AtomicI32; use crate::sync::atomic::Ordering::{Acquire, Release}; + use crate::sync::atomic::{Atomic, AtomicI32}; - static LOCKED: AtomicI32 = AtomicI32::new(0); + static LOCKED: Atomic<i32> = AtomicI32::new(0); pub struct DropLock; |