---

yaml
---
r: 13726
b: refs/heads/master
c: 404afcb
h: refs/heads/master
v: v3

Author: eholk

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 697f1e38d646bb6c7bab054c8c8c5b469c566ef6
+refs/heads/master: 404afcbb41898cf7f516f07cae3dc42e47bda46d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/arc.rs

@@ -104,19 +104,17 @@ impl methods<T: send> for exclusive<T> {
         arc_destruct(self.data)
     }
 
-    fn with<U>(f: fn(sys::condition, x: &T) -> U) -> U {
-        unsafe {
-            let ptr: ~arc_data<ex_data<T>> =
-                  unsafe::reinterpret_cast(self.data);
-            let r = {
-                let rec: &ex_data<T> = &(*ptr).data;
-                rec.lock.lock_cond() {|c|
-                    f(c, &rec.data)
-                }
-            };
-            unsafe::forget(ptr);
-            r
-        }
+    unsafe fn with<U>(f: fn(sys::condition, x: &T) -> U) -> U {
+        let ptr: ~arc_data<ex_data<T>> =
+            unsafe::reinterpret_cast(self.data);
+        let r = {
+            let rec: &ex_data<T> = &(*ptr).data;
+            rec.lock.lock_cond() {|c|
+                f(c, &rec.data)
+            }
+        };
+        unsafe::forget(ptr);
+        r
     }
 }
 

trunk/src/libcore/sys.rs

@@ -106,13 +106,13 @@ fn create_lock() -> lock_and_signal {
 }
 
 impl methods for lock_and_signal {
-    fn lock<T>(f: fn() -> T) -> T {
+    unsafe fn lock<T>(f: fn() -> T) -> T {
         rustrt::rust_lock_cond_lock(self.lock);
         let _r = unlock(self.lock);
         f()
     }
 
-    fn lock_cond<T>(f: fn(condition) -> T) -> T {
+    unsafe fn lock_cond<T>(f: fn(condition) -> T) -> T {
         rustrt::rust_lock_cond_lock(self.lock);
         let _r = unlock(self.lock);
         f(condition_(self.lock))