Skip to content

Commit 2040a5c

Browse files
committed
tiny runtime cleanup
1 parent f42a5a1 commit 2040a5c

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

src/rt/rust_builtin.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -882,6 +882,11 @@ rust_task_kill_all(rust_task *task) { /* Used for linked failure */
882882
main_taskgroup_failed = true;
883883
}
884884

885+
extern "C" CDECL
886+
bool rust_task_is_unwinding(rust_task *rt) {
887+
return rt->unwinding;
888+
}
889+
885890
extern "C" rust_cond_lock*
886891
rust_create_cond_lock() {
887892
return new rust_cond_lock();

src/rt/rust_task.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -295,12 +295,6 @@ void rust_task::kill_inner() {
295295
LOG(this, task, "preparing to unwind task: 0x%" PRIxPTR, this);
296296
}
297297

298-
// (bblum): Move this to rust_builtin.cpp (cleanup)
299-
extern "C" CDECL
300-
bool rust_task_is_unwinding(rust_task *rt) {
301-
return rt->unwinding;
302-
}
303-
304298
void
305299
rust_task::fail() {
306300
// See note in ::kill() regarding who should call this.

src/rt/rust_task.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@ rust_task : public kernel_owned<rust_task>
274274
void fail(char const *expr, char const *file, size_t line);
275275

276276
// Propagate failure to the entire rust runtime.
277-
// FIXME (#1868) (bblum): maybe this can be done at rust-level?
278277
void fail_sched_loop();
279278

280279
frame_glue_fns *get_frame_glue_fns(uintptr_t fp);

0 commit comments

Comments
 (0)