---

yaml
---
r: 39791
b: refs/heads/incoming
c: ad2fc50
h: refs/heads/master
i:
  39789: f5aeea8
  39787: be3733d
  39783: 885e47e
  39775: fc2971b
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: c6fe93d9b5ac40cfacc8d8e8e55261d284de4829
+refs/heads/incoming: ad2fc50ca1d8fecdc54306203f226d87a365ce36
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/task/mod.rs

@@ -971,15 +971,17 @@ fn test_spawn_sched_blocking() {
             let lock = testrt::rust_dbg_lock_create();
 
             do spawn_sched(SingleThreaded) {
-                testrt::rust_dbg_lock_lock(lock);
+                unsafe {
+                    testrt::rust_dbg_lock_lock(lock);
 
-                oldcomm::send(start_ch, ());
+                    oldcomm::send(start_ch, ());
 
-                // 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);
 
-                oldcomm::send(fin_ch, ());
+                    oldcomm::send(fin_ch, ());
+                }
             };
 
             // Wait until the other task has its lock