rt: Move some code from rust_port_detach into rust_port::detach

2 files changed, 6 insertions, 6 deletions

diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index dcf01e4420e..17c958633d1 100644
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -486,12 +486,6 @@ rust_port_detach(rust_port *port) {
     rust_task *task = rust_task_thread::get_task();
     LOG(task, comm, "rust_port_detach(0x%" PRIxPTR ")", (uintptr_t) port);
     port->detach();
-    // FIXME: Busy waiting until we're the only ref
-    bool done = false;
-    while (!done) {
-        scoped_lock with(task->port_lock);
-        done = port->ref_count == 1;
-    }
 }
 
 extern "C" CDECL void
diff --git a/src/rt/rust_port.cpp b/src/rt/rust_port.cpp
index 46e18ba1acb..f4843971e42 100644
--- a/src/rt/rust_port.cpp
+++ b/src/rt/rust_port.cpp
@@ -22,6 +22,12 @@ rust_port::~rust_port() {
 
 void rust_port::detach() {
     task->release_port(id);
+    // FIXME: Busy waiting until we're the only ref
+    bool done = false;
+    while (!done) {
+        scoped_lock with(task->port_lock);
+        done = ref_count == 1;
+    }
 }
 
 void rust_port::send(void *sptr) {