Added a few utility classes, cleaned up the include order of .h files, and started to make the Rust kernel own domain message queues rather than the Rust domains themselves.

1 files changed, 3 insertions, 10 deletions

diff --git a/src/rt/rust_dom.h b/src/rt/rust_dom.h
index 44f56cc41bb..5c9c29533c4 100644
--- a/src/rt/rust_dom.h
+++ b/src/rt/rust_dom.h
@@ -1,16 +1,6 @@
-/*
- * rust_dom.h
- */
-
 #ifndef RUST_DOM_H
 #define RUST_DOM_H
 
-#include "sync/lock_free_queue.h"
-#include "util/hash_map.h"
-
-#include "rust_proxy.h"
-#include "rust_message.h"
-
 struct rust_dom
 {
     // Fields known to the compiler:
@@ -37,6 +27,9 @@ struct rust_dom
     rust_task *curr_task;
     int rval;
 
+    rust_kernel *_kernel;
+    int32_t list_index;
+
     hash_map<rust_task *, rust_proxy<rust_task> *> _task_proxies;
     hash_map<rust_port *, rust_proxy<rust_port> *> _port_proxies;