---

yaml
---
r: 16017
b: refs/heads/try
c: 6ca6a3b
h: refs/heads/master
i:
  16015: b4e18c3
v: v3

Author: nikomatsakis

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 4fec4cd8f5ad45e8caea324df7434a82e560ca38
+refs/heads/try: 6ca6a3b80be1c7a5638156638a8a11e514bc3ef3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libstd/arc.rs

@@ -6,11 +6,11 @@ export arc, get, clone;
 #[abi = "cdecl"]
 native mod rustrt {
     #[rust_stack]
-    fn rust_atomic_increment(p: *mut libc::intptr_t)
+    fn rust_atomic_increment(p: &mut libc::intptr_t)
         -> libc::intptr_t;
 
     #[rust_stack]
-    fn rust_atomic_decrement(p: *mut libc::intptr_t)
+    fn rust_atomic_decrement(p: &mut libc::intptr_t)
         -> libc::intptr_t;
 }
 
@@ -21,7 +21,7 @@ type arc_data<T> = {
 
 resource arc_destruct<T>(data: *arc_data<T>) {
     unsafe {
-        let ptr = ptr::mut_addr_of((*data).count);
+        let ptr = &mut (*data).count;
 
         let new_count = rustrt::rust_atomic_decrement(ptr);
         assert new_count >= 0;
@@ -52,8 +52,7 @@ fn get<T>(rc: &a.arc<T>) -> &a.T {
 fn clone<T>(rc: &arc<T>) -> arc<T> {
     let data = **rc;
     unsafe {
-        rustrt::rust_atomic_increment(
-            ptr::mut_addr_of((*data).count));
+        rustrt::rust_atomic_increment(&mut (*data).count);
     }
     arc_destruct(**rc)
 }