cleanup: s/impl Copy/#[derive(Copy)]/g

[rust.git] / src / test / run-pass / intrinsic-atomics.rs

diff --git a/src/test/run-pass/intrinsic-atomics.rs b/src/test/run-pass/intrinsic-atomics.rs
index f1354cbb20f5da526f61c24f9d7509447919e61b..0644fbbc99f41499c320d8d2e3d0c8733affdfbf 100644 (file)
--- a/src/test/run-pass/intrinsic-atomics.rs
+++ b/src/test/run-pass/intrinsic-atomics.rs
@@ -8,72 +8,75 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#![allow(unknown_features)]
+#![feature(box_syntax)]
+#![feature(intrinsics)]
+
 mod rusti {
-    #[abi = "rust-intrinsic"]
     extern "rust-intrinsic" {
-        pub fn atomic_cxchg(dst: &mut int, old: int, src: int) -> int;
-        pub fn atomic_cxchg_acq(dst: &mut int, old: int, src: int) -> int;
-        pub fn atomic_cxchg_rel(dst: &mut int, old: int, src: int) -> int;
+        pub fn atomic_cxchg<T>(dst: *mut T, old: T, src: T) -> T;
+        pub fn atomic_cxchg_acq<T>(dst: *mut T, old: T, src: T) -> T;
+        pub fn atomic_cxchg_rel<T>(dst: *mut T, old: T, src: T) -> T;
 
-        pub fn atomic_load(src: &int) -> int;
-        pub fn atomic_load_acq(src: &int) -> int;
+        pub fn atomic_load<T>(src: *const T) -> T;
+        pub fn atomic_load_acq<T>(src: *const T) -> T;
 
-        pub fn atomic_store(dst: &mut int, val: int);
-        pub fn atomic_store_rel(dst: &mut int, val: int);
+        pub fn atomic_store<T>(dst: *mut T, val: T);
+        pub fn atomic_store_rel<T>(dst: *mut T, val: T);
 
-        pub fn atomic_xchg(dst: &mut int, src: int) -> int;
-        pub fn atomic_xchg_acq(dst: &mut int, src: int) -> int;
-        pub fn atomic_xchg_rel(dst: &mut int, src: int) -> int;
+        pub fn atomic_xchg<T>(dst: *mut T, src: T) -> T;
+        pub fn atomic_xchg_acq<T>(dst: *mut T, src: T) -> T;
+        pub fn atomic_xchg_rel<T>(dst: *mut T, src: T) -> T;
 
-        pub fn atomic_xadd(dst: &mut int, src: int) -> int;
-        pub fn atomic_xadd_acq(dst: &mut int, src: int) -> int;
-        pub fn atomic_xadd_rel(dst: &mut int, src: int) -> int;
+        pub fn atomic_xadd<T>(dst: *mut T, src: T) -> T;
+        pub fn atomic_xadd_acq<T>(dst: *mut T, src: T) -> T;
+        pub fn atomic_xadd_rel<T>(dst: *mut T, src: T) -> T;
 
-        pub fn atomic_xsub(dst: &mut int, src: int) -> int;
-        pub fn atomic_xsub_acq(dst: &mut int, src: int) -> int;
-        pub fn atomic_xsub_rel(dst: &mut int, src: int) -> int;
+        pub fn atomic_xsub<T>(dst: *mut T, src: T) -> T;
+        pub fn atomic_xsub_acq<T>(dst: *mut T, src: T) -> T;
+        pub fn atomic_xsub_rel<T>(dst: *mut T, src: T) -> T;
     }
 }
 
 pub fn main() {
     unsafe {
-        let mut x = ~1;
+        let mut x = box 1i;
 
-        assert_eq!(rusti::atomic_load(x), 1);
+        assert_eq!(rusti::atomic_load(&*x), 1);
         *x = 5;
-        assert_eq!(rusti::atomic_load_acq(x), 5);
+        assert_eq!(rusti::atomic_load_acq(&*x), 5);
 
-        rusti::atomic_store(x,3);
+        rusti::atomic_store(&mut *x,3);
         assert_eq!(*x, 3);
-        rusti::atomic_store_rel(x,1);
+        rusti::atomic_store_rel(&mut *x,1);
         assert_eq!(*x, 1);
 
-        assert_eq!(rusti::atomic_cxchg(x, 1, 2), 1);
+        assert_eq!(rusti::atomic_cxchg(&mut *x, 1, 2), 1);
         assert_eq!(*x, 2);
 
-        assert_eq!(rusti::atomic_cxchg_acq(x, 1, 3), 2);
+        assert_eq!(rusti::atomic_cxchg_acq(&mut *x, 1, 3), 2);
         assert_eq!(*x, 2);
 
-        assert_eq!(rusti::atomic_cxchg_rel(x, 2, 1), 2);
+        assert_eq!(rusti::atomic_cxchg_rel(&mut *x, 2, 1), 2);
         assert_eq!(*x, 1);
 
-        assert_eq!(rusti::atomic_xchg(x, 0), 1);
+        assert_eq!(rusti::atomic_xchg(&mut *x, 0), 1);
         assert_eq!(*x, 0);
 
-        assert_eq!(rusti::atomic_xchg_acq(x, 1), 0);
+        assert_eq!(rusti::atomic_xchg_acq(&mut *x, 1), 0);
         assert_eq!(*x, 1);
 
-        assert_eq!(rusti::atomic_xchg_rel(x, 0), 1);
+        assert_eq!(rusti::atomic_xchg_rel(&mut *x, 0), 1);
         assert_eq!(*x, 0);
 
-        assert_eq!(rusti::atomic_xadd(x, 1), 0);
-        assert_eq!(rusti::atomic_xadd_acq(x, 1), 1);
-        assert_eq!(rusti::atomic_xadd_rel(x, 1), 2);
+        assert_eq!(rusti::atomic_xadd(&mut *x, 1), 0);
+        assert_eq!(rusti::atomic_xadd_acq(&mut *x, 1), 1);
+        assert_eq!(rusti::atomic_xadd_rel(&mut *x, 1), 2);
         assert_eq!(*x, 3);
 
-        assert_eq!(rusti::atomic_xsub(x, 1), 3);
-        assert_eq!(rusti::atomic_xsub_acq(x, 1), 2);
-        assert_eq!(rusti::atomic_xsub_rel(x, 1), 1);
+        assert_eq!(rusti::atomic_xsub(&mut *x, 1), 3);
+        assert_eq!(rusti::atomic_xsub_acq(&mut *x, 1), 2);
+        assert_eq!(rusti::atomic_xsub_rel(&mut *x, 1), 1);
         assert_eq!(*x, 0);
     }
 }