---

yaml
---
r: 20595
b: refs/heads/snap-stage3
c: 2040a5c
h: refs/heads/master
i:
  20593: b90f59c
  20591: cd944fd
v: v3

Author: bblum

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: f42a5a1acd125982ab19abf3e892a819aceab45a
+refs/heads/snap-stage3: 2040a5c632caa8b0918979c552530782ca9e4a81
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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();

branches/snap-stage3/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.

branches/snap-stage3/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);