---

yaml
---
r: 11644
b: refs/heads/master
c: 93fa933
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e3ccac8ed3b447ffecfbba7402760c083b9e51e2
+refs/heads/master: 93fa933a1926f953fa74b9b4908c0e6dc9b0a964
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/rust_port.cpp

@@ -21,11 +21,7 @@ rust_port::~rust_port() {
 }
 
 void rust_port::detach() {
-    I(task->thread, !task->port_lock.lock_held_by_current_thread());
-    scoped_lock with(task->port_lock);
-    {
-        task->release_port(id);
-    }
+    task->release_port(id);
 }
 
 void rust_port::send(void *sptr) {

trunk/src/rt/rust_task.cpp

@@ -481,7 +481,7 @@ rust_port_id rust_task::register_port(rust_port *port) {
 }
 
 void rust_task::release_port(rust_port_id id) {
-    I(thread, port_lock.lock_held_by_current_thread());
+    scoped_lock with(port_lock);
     port_table.remove(id);
 }