diff options
| author | bors <bors@rust-lang.org> | 2015-01-12 22:56:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-12 22:56:20 +0000 |
| commit | 3d0d9bb6fbdf6ead9396f0874cf38f3ef7c9be5c (patch) | |
| tree | 9994c5b80534154e0130716d304d9185e7ae3481 /src/libcoretest | |
| parent | 3a44a19af29585c02e81e22ea7665f829ae0590a (diff) | |
| parent | 8b6cda3ce681d4d95c3097d12ed754975b4a07f6 (diff) | |
| download | rust-3d0d9bb6fbdf6ead9396f0874cf38f3ef7c9be5c.tar.gz rust-3d0d9bb6fbdf6ead9396f0874cf38f3ef7c9be5c.zip | |
auto merge of #20896 : sfackler/rust/atomic-rename, r=alexcrichton
Change any use of AtomicInt to AtomicIsize and AtomicUint to AtomicUsize Closes #20893 [breaking-change]
Diffstat (limited to 'src/libcoretest')
| -rw-r--r-- | src/libcoretest/atomic.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libcoretest/atomic.rs b/src/libcoretest/atomic.rs index f8e943ec9f6..8e3c7f4595a 100644 --- a/src/libcoretest/atomic.rs +++ b/src/libcoretest/atomic.rs @@ -30,49 +30,49 @@ fn bool_and() { #[test] fn uint_and() { - let x = AtomicUint::new(0xf731); + let x = AtomicUsize::new(0xf731); assert_eq!(x.fetch_and(0x137f, SeqCst), 0xf731); assert_eq!(x.load(SeqCst), 0xf731 & 0x137f); } #[test] fn uint_or() { - let x = AtomicUint::new(0xf731); + let x = AtomicUsize::new(0xf731); assert_eq!(x.fetch_or(0x137f, SeqCst), 0xf731); assert_eq!(x.load(SeqCst), 0xf731 | 0x137f); } #[test] fn uint_xor() { - let x = AtomicUint::new(0xf731); + let x = AtomicUsize::new(0xf731); assert_eq!(x.fetch_xor(0x137f, SeqCst), 0xf731); assert_eq!(x.load(SeqCst), 0xf731 ^ 0x137f); } #[test] fn int_and() { - let x = AtomicInt::new(0xf731); + let x = AtomicIsize::new(0xf731); assert_eq!(x.fetch_and(0x137f, SeqCst), 0xf731); assert_eq!(x.load(SeqCst), 0xf731 & 0x137f); } #[test] fn int_or() { - let x = AtomicInt::new(0xf731); + let x = AtomicIsize::new(0xf731); assert_eq!(x.fetch_or(0x137f, SeqCst), 0xf731); assert_eq!(x.load(SeqCst), 0xf731 | 0x137f); } #[test] fn int_xor() { - let x = AtomicInt::new(0xf731); + let x = AtomicIsize::new(0xf731); assert_eq!(x.fetch_xor(0x137f, SeqCst), 0xf731); assert_eq!(x.load(SeqCst), 0xf731 ^ 0x137f); } static S_BOOL : AtomicBool = ATOMIC_BOOL_INIT; -static S_INT : AtomicInt = ATOMIC_INT_INIT; -static S_UINT : AtomicUint = ATOMIC_UINT_INIT; +static S_INT : AtomicIsize = ATOMIC_ISIZE_INIT; +static S_UINT : AtomicUsize = ATOMIC_USIZE_INIT; #[test] fn static_init() { |