1 files changed, 1 insertions, 7 deletions
diff --git a/src/rt/rust_task_thread.cpp b/src/rt/rust_task_thread.cpp
index 3c3c11b0a1e..63dcd3c846b 100644
--- a/src/rt/rust_task_thread.cpp
+++ b/src/rt/rust_task_thread.cpp
@@ -308,11 +308,7 @@ void
 rust_task_thread::transition(rust_task *task,
                              rust_task_list *src, rust_task_list *dst,
                              rust_cond *cond, const char* cond_name) {
-    bool unlock = false;
-    if(!lock.lock_held_by_current_thread()) {
-        unlock = true;
-        lock.lock();
-    }
+    scoped_lock with(lock);
     DLOG(this, task,
          "task %s " PTR " state change '%s' -> '%s' while in '%s'",
          name, (uintptr_t)this, src->name, dst->name,
@@ -323,8 +319,6 @@ rust_task_thread::transition(rust_task *task,
     task->set_state(dst, cond, cond_name);
 
     lock.signal();
-    if(unlock)
-        lock.unlock();
 }
 
 void rust_task_thread::run() {