rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Mark exclusive arc-related functions as unsafe. Fixes #2727.

Browse Source
This commit is contained in:
Eric Holk
2012-06-27 10:24:51 -07:00
parent 697f1e38d6
commit 404afcbb41
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcore/arc.rs
View File

@@ -104,8 +104,7 @@ impl methods<T: send> for exclusive<T> {
arc_destruct(self.data) arc_destruct(self.data)
} }
fn with<U>(f: fn(sys::condition, x: &T) -> U) -> U { unsafe fn with<U>(f: fn(sys::condition, x: &T) -> U) -> U {
unsafe {
let ptr: ~arc_data<ex_data<T>> = let ptr: ~arc_data<ex_data<T>> =
unsafe::reinterpret_cast(self.data); unsafe::reinterpret_cast(self.data);
let r = { let r = {
@@ -118,7 +117,6 @@ impl methods<T: send> for exclusive<T> {
r r
} }
} }
}
// Convenience code for sharing arcs between tasks // Convenience code for sharing arcs between tasks

4
src/libcore/sys.rs
View File

@@ -106,13 +106,13 @@ fn create_lock() -> lock_and_signal {
} }
impl methods for 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); rustrt::rust_lock_cond_lock(self.lock);
let _r = unlock(self.lock); let _r = unlock(self.lock);
f() 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); rustrt::rust_lock_cond_lock(self.lock);
let _r = unlock(self.lock); let _r = unlock(self.lock);
f(condition_(self.lock)) f(condition_(self.lock))