Comments only: TODOs to FIXME in the runtime

6 files changed, 9 insertions, 8 deletions

diff --git a/src/rt/rust_abi.cpp b/src/rt/rust_abi.cpp
index b533ab1f673..8de42bb6666 100644
--- a/src/rt/rust_abi.cpp
+++ b/src/rt/rust_abi.cpp
@@ -11,7 +11,7 @@
 #define HAVE_DLFCN_H
 #include <dlfcn.h>
 #elif defined(_WIN32)
-// TODO
+// FIXME #2889
 #endif
 
 #define END_OF_STACK_RA     (void (*)())0xdeadbeef
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index 55f1f8bf17e..ffba7b0da6a 100644
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -938,8 +938,8 @@ task_clear_event_reject(rust_task *task) {
 // task.
 extern "C" void *
 task_wait_event(rust_task *task, bool *killed) {
-    // TODO: we should assert that the passed in task is the currently running
-    // task. We wouldn't want to wait some other task.
+    // FIXME #2890: we should assert that the passed in task is the currently
+    // running task. We wouldn't want to wait some other task.
 
     return task->wait_event(killed);
 }
diff --git a/src/rt/rust_sched_loop.cpp b/src/rt/rust_sched_loop.cpp
index 1cf9b275427..4b94968d7c0 100644
--- a/src/rt/rust_sched_loop.cpp
+++ b/src/rt/rust_sched_loop.cpp
@@ -25,7 +25,7 @@ rust_sched_loop::rust_sched_loop(rust_scheduler *sched,int id) :
     log_lvl(log_debug),
     min_stack_size(kernel->env->min_stack_size),
     local_region(kernel->env, false),
-    // TODO: calculate a per scheduler name.
+    // FIXME #2891: calculate a per-scheduler name.
     name("main")
 {
     LOGPTR(this, "new dom", (uintptr_t)this);
diff --git a/src/rt/rust_shape.cpp b/src/rt/rust_shape.cpp
index cb4afa904c9..bfe4b97936a 100644
--- a/src/rt/rust_shape.cpp
+++ b/src/rt/rust_shape.cpp
@@ -160,7 +160,7 @@ size_of::walk_struct1(const uint8_t *end_sp) {
 #if 0
 
 class copy : public data<copy,uint8_t *> {
-    // TODO
+    // FIXME #2892
 };
 
 #endif
diff --git a/src/rt/rust_shape.h b/src/rt/rust_shape.h
index b0f021287c0..ffbe6117422 100644
--- a/src/rt/rust_shape.h
+++ b/src/rt/rust_shape.h
@@ -570,7 +570,7 @@ public:
 // Size-of (which also computes alignment). Be warned: this is an expensive
 // operation.
 //
-// TODO: Maybe dynamic_size_of() should call into this somehow?
+// FIXME #2894: Maybe dynamic_size_of() should call into this somehow?
 //
 
 class size_of : public ctxt<size_of> {
@@ -612,7 +612,7 @@ public:
     }
 
     void walk_res1(const rust_fn *dtor, const uint8_t *end_sp) {
-        abort();    // TODO
+        abort();    // FIXME #2895
     }
 
     void walk_fixedvec1(uint16_t n_elts, bool is_pod) {
diff --git a/src/rt/sync/lock_and_signal.cpp b/src/rt/sync/lock_and_signal.cpp
index 9558aaa7c06..b1c13205f2b 100644
--- a/src/rt/sync/lock_and_signal.cpp
+++ b/src/rt/sync/lock_and_signal.cpp
@@ -29,7 +29,8 @@ lock_and_signal::lock_and_signal()
     const DWORD SPIN_COUNT = 4000;
     CHECKED(!InitializeCriticalSectionAndSpinCount(&_cs, SPIN_COUNT));
 
-    // TODO? Consider checking GetProcAddress("InitializeCriticalSectionEx")
+    // FIXME #2893 Consider checking
+    // GetProcAddress("InitializeCriticalSectionEx")
     // so Windows >= Vista we can use CRITICAL_SECTION_NO_DEBUG_INFO to avoid
     // allocating CRITICAL_SECTION debug info that is never released. See:
     // http://stackoverflow.com/questions/804848/