From 404afcbb41898cf7f516f07cae3dc42e47bda46d Mon Sep 17 00:00:00 2001
From: Eric Holk <eric.holk@gmail.com>
Date: Wed, 27 Jun 2012 10:24:51 -0700
Subject: [PATCH] Mark exclusive arc-related functions as unsafe. Fixes #2727.

---
 src/libcore/arc.rs | 24 +++++++++++-------------
 src/libcore/sys.rs |  4 ++--
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/libcore/arc.rs b/src/libcore/arc.rs
index f13a34d260e5..12ada1b9b18a 100644
--- a/src/libcore/arc.rs
+++ b/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
     }
 }
 
diff --git a/src/libcore/sys.rs b/src/libcore/sys.rs
index 771107cd1a7e..05616b0dcf37 100644
--- a/src/libcore/sys.rs
+++ b/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))