diff options
| author | toddaaro <github@opprobrio.us> | 2013-06-14 12:17:56 -0700 |
|---|---|---|
| committer | toddaaro <github@opprobrio.us> | 2013-06-14 12:17:56 -0700 |
| commit | d1ec8b5fb85cb6fd4caed64223c5cb3fd920daab (patch) | |
| tree | 47dc844dc524065a5c5c7948c149488ce0390e7b /src/libstd/rt/local.rs | |
| parent | 4224fc7aad3cfbd7093e55812e5a566d7aad3325 (diff) | |
| download | rust-d1ec8b5fb85cb6fd4caed64223c5cb3fd920daab.tar.gz rust-d1ec8b5fb85cb6fd4caed64223c5cb3fd920daab.zip | |
redesigned the pinning to pin deal with things on dequeue, not on enqueue
Diffstat (limited to 'src/libstd/rt/local.rs')
| -rw-r--r-- | src/libstd/rt/local.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/rt/local.rs b/src/libstd/rt/local.rs index 359cf5fc3e1..6e0fbda5ec9 100644 --- a/src/libstd/rt/local.rs +++ b/src/libstd/rt/local.rs @@ -30,7 +30,7 @@ impl Local for Scheduler { fn borrow<T>(f: &fn(&mut Scheduler) -> T) -> T { let mut res: Option<T> = None; let res_ptr: *mut Option<T> = &mut res; - unsafe { + unsafe { do local_ptr::borrow |sched| { let result = f(sched); *res_ptr = Some(result); @@ -39,7 +39,7 @@ impl Local for Scheduler { match res { Some(r) => { r } None => abort!("function failed!") - } + } } unsafe fn unsafe_borrow() -> *mut Scheduler { local_ptr::unsafe_borrow() } unsafe fn try_unsafe_borrow() -> Option<*mut Scheduler> { abort!("unimpl") } @@ -139,5 +139,5 @@ mod test { assert!(res) let _scheduler: ~Scheduler = Local::take(); } - + } |
