refactor(crates): move some crates from modules folder into crates fo…

…lder
ChenRuiwei · Apr 8, 2024 · 2ea0bc3 · 2ea0bc3
1 parent 658cccf
commit 2ea0bc3
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,3 +1,11 @@
 [workspace]
-members = ["kernel", "arch", "config", "modules/*", "driver", "user"]
+members = [
+    "kernel",
+    "arch",
+    "config",
+    "modules/*",
+    "driver",
+    "user",
+    "crates/*",
+]
 resolver = "2"
diff --git a/modules/irq_count/Cargo.toml → crates/irq_count/Cargo.toml b/modules/irq_count/Cargo.toml → crates/irq_count/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-sync = { path = "../sync/" }
+sync = { path = "../../modules/sync/" }
diff --git a/modules/irq_count/src/lib.rs → crates/irq_count/src/lib.rs b/modules/irq_count/src/lib.rs → crates/irq_count/src/lib.rs
diff --git a/modules/recycle_allocator/Cargo.toml → crates/recycle_allocator/Cargo.toml b/modules/recycle_allocator/Cargo.toml → crates/recycle_allocator/Cargo.toml
diff --git a/modules/recycle_allocator/src/lib.rs → crates/recycle_allocator/src/lib.rs b/modules/recycle_allocator/src/lib.rs → crates/recycle_allocator/src/lib.rs
diff --git a/driver/Cargo.toml b/driver/Cargo.toml
@@ -11,7 +11,7 @@ config = { path = "../config/" }
 sync = { path = "../modules/sync/" }
 memory = { path = "../modules/memory/" }
 systype = { path = "../modules/systype/" }
-irq_count = { path = "../modules/irq_count/" }
+irq_count = { path = "../crates/irq_count/" }
 
 log = "0.4"
 virtio-drivers = { version = "0.7" }

diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
@@ -14,8 +14,8 @@ executor = { path = "../modules/executor/" }
 systype = { path = "../modules/systype/" }
 memory = { path = "../modules/memory/" }
 async_utils = { path = "../modules/async_utils/" }
-irq_count = { path = "../modules/irq_count/" }
-recycle_allocator = { path = "../modules/recycle_allocator/" }
+irq_count = { path = "../crates//irq_count/" }
+recycle_allocator = { path = "../crates/recycle_allocator/" }
 
 cfg-if = "1.0"
 buddy_system_allocator = "0.9"