From 342a413b9a8e1c72b130b0c8d452b3bb3e6a5d2c Mon Sep 17 00:00:00 2001
From: Nova <technobaboo@gmail.com>
Date: Tue, 13 Sep 2022 15:39:09 -0400
Subject: [PATCH] refactor: clean up modules

---
 src/core/mod.rs   | 4 ++--
 src/nodes/core.rs | 3 ++-
 src/nodes/mod.rs  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/core/mod.rs b/src/core/mod.rs
index 9bfc371..3ca7e83 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -1,7 +1,7 @@
-pub mod destroy_queue;
-pub mod resource;
 pub mod client;
+pub mod destroy_queue;
 pub mod eventloop;
 pub mod nodelist;
 pub mod registry;
+pub mod resource;
 pub mod scenegraph;
diff --git a/src/nodes/core.rs b/src/nodes/core.rs
index 917e5cc..bbcb3de 100644
--- a/src/nodes/core.rs
+++ b/src/nodes/core.rs
@@ -23,7 +23,6 @@ pub type Method = fn(&Node, Arc<Client>, &[u8]) -> Result<Vec<u8>>;
 
 pub struct Node {
 	pub(super) uid: String,
-	pub(crate) client: Weak<Client>,
 	path: String,
 	// trailing_slash_pos: usize,
 	local_signals: DashMap<String, Signal, BuildHasherDefault<FxHasher>>,
@@ -43,6 +42,8 @@ pub struct Node {
 	pub item_ui: OnceCell<Arc<ItemUI>>,
 	pub input_method: OnceCell<Arc<InputMethod>>,
 	pub input_handler: OnceCell<Arc<InputHandler>>,
+
+	pub(crate) client: Weak<Client>,
 }
 
 impl Node {
diff --git a/src/nodes/mod.rs b/src/nodes/mod.rs
index 89b6dd9..8eaae3b 100644
--- a/src/nodes/mod.rs
+++ b/src/nodes/mod.rs
@@ -1,7 +1,7 @@
-pub mod hmd;
 pub mod core;
 pub mod data;
 pub mod field;
+pub mod hmd;
 pub mod input;
 pub mod input_pointer;
 pub mod item;