From 8b6cda3ce681d4d95c3097d12ed754975b4a07f6 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sat, 10 Jan 2015 13:42:48 -0800 Subject: Rename AtomicInt and AtomicUint Change any use of AtomicInt to AtomicIsize and AtomicUint to AtomicUsize Closes #20893 [breaking-change] --- src/liballoc/arc.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/liballoc') diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs index 290dd21d666..c0cd034abfa 100644 --- a/src/liballoc/arc.rs +++ b/src/liballoc/arc.rs @@ -137,8 +137,8 @@ unsafe impl Send for Weak { } unsafe impl Sync for Weak { } struct ArcInner { - strong: atomic::AtomicUint, - weak: atomic::AtomicUint, + strong: atomic::AtomicUsize, + weak: atomic::AtomicUsize, data: T, } @@ -161,8 +161,8 @@ impl Arc { // Start the weak pointer count as 1 which is the weak pointer that's // held by all the strong pointers (kinda), see std/rc.rs for more info let x = box ArcInner { - strong: atomic::AtomicUint::new(1), - weak: atomic::AtomicUint::new(1), + strong: atomic::AtomicUsize::new(1), + weak: atomic::AtomicUsize::new(1), data: data, }; Arc { _ptr: unsafe { NonZero::new(mem::transmute(x)) } } @@ -619,7 +619,7 @@ mod tests { use super::{Arc, Weak, weak_count, strong_count}; use std::sync::Mutex; - struct Canary(*mut atomic::AtomicUint); + struct Canary(*mut atomic::AtomicUsize); impl Drop for Canary { @@ -743,16 +743,16 @@ mod tests { #[test] fn drop_arc() { - let mut canary = atomic::AtomicUint::new(0); - let x = Arc::new(Canary(&mut canary as *mut atomic::AtomicUint)); + let mut canary = atomic::AtomicUsize::new(0); + let x = Arc::new(Canary(&mut canary as *mut atomic::AtomicUsize)); drop(x); assert!(canary.load(Acquire) == 1); } #[test] fn drop_arc_weak() { - let mut canary = atomic::AtomicUint::new(0); - let arc = Arc::new(Canary(&mut canary as *mut atomic::AtomicUint)); + let mut canary = atomic::AtomicUsize::new(0); + let arc = Arc::new(Canary(&mut canary as *mut atomic::AtomicUsize)); let arc_weak = arc.downgrade(); assert!(canary.load(Acquire) == 0); drop(arc); -- cgit 1.4.1-3-g733a5