about summary refs log tree commit diff
path: root/src/libstd/task
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-06-27 15:01:58 -0700
committerbors <bors@rust-lang.org>2013-06-27 15:01:58 -0700
commit63afb8ccc8dd945e35fa43ca319aeaa5fba78134 (patch)
tree4c0757e660bffe4cc557d8790fa6b359bc5542eb /src/libstd/task
parent4c86a0431b637edd23b91234765402bb41edcae8 (diff)
parent366ca44cc8f79704f8781adb15e74d3c2a0e5572 (diff)
downloadrust-63afb8ccc8dd945e35fa43ca319aeaa5fba78134.tar.gz
rust-63afb8ccc8dd945e35fa43ca319aeaa5fba78134.zip
auto merge of #7430 : huonw/rust/vec-kill, r=thestinger
Diffstat (limited to 'src/libstd/task')
-rw-r--r--src/libstd/task/mod.rs14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/libstd/task/mod.rs b/src/libstd/task/mod.rs
index 223afbce091..b558b9d53a3 100644
--- a/src/libstd/task/mod.rs
+++ b/src/libstd/task/mod.rs
@@ -934,17 +934,15 @@ fn test_spawn_sched_blocking() {
             let lock = testrt::rust_dbg_lock_create();
 
             do spawn_sched(SingleThreaded) {
-                unsafe {
-                    testrt::rust_dbg_lock_lock(lock);
+                testrt::rust_dbg_lock_lock(lock);
 
-                    start_ch.send(());
+                start_ch.send(());
 
-                    // Block the scheduler thread
-                    testrt::rust_dbg_lock_wait(lock);
-                    testrt::rust_dbg_lock_unlock(lock);
+                // Block the scheduler thread
+                testrt::rust_dbg_lock_wait(lock);
+                testrt::rust_dbg_lock_unlock(lock);
 
-                    fin_ch.send(());
-                }
+                fin_ch.send(());
             };
 
             // Wait until the other task has its lock