tiny runtime cleanup

radford · Jul 24, 2012 · 2040a5c · 2040a5c
1 parent f42a5a1
commit 2040a5c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
@@ -882,6 +882,11 @@ rust_task_kill_all(rust_task *task) { /* Used for linked failure */
     main_taskgroup_failed = true;
 }
 
+extern "C" CDECL
+bool rust_task_is_unwinding(rust_task *rt) {
+    return rt->unwinding;
+}
+
 extern "C" rust_cond_lock*
 rust_create_cond_lock() {
     return new rust_cond_lock();

diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp
@@ -295,12 +295,6 @@ void rust_task::kill_inner() {
     LOG(this, task, "preparing to unwind task: 0x%" PRIxPTR, this);
 }
 
-// (bblum): Move this to rust_builtin.cpp (cleanup)
-extern "C" CDECL
-bool rust_task_is_unwinding(rust_task *rt) {
-    return rt->unwinding;
-}
-
 void
 rust_task::fail() {
     // See note in ::kill() regarding who should call this.

diff --git a/src/rt/rust_task.h b/src/rt/rust_task.h
@@ -274,7 +274,6 @@ rust_task : public kernel_owned<rust_task>
     void fail(char const *expr, char const *file, size_t line);
 
     // Propagate failure to the entire rust runtime.
-    // FIXME (#1868) (bblum): maybe this can be done at rust-level?
     void fail_sched_loop();
 
     frame_glue_fns *get_frame_glue_fns(uintptr_t fp);