diff --git a/Cargo.toml b/Cargo.toml index b5dcc411..d03007c7 100644 --- 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 b/crates/irq_count/Cargo.toml similarity index 81% rename from modules/irq_count/Cargo.toml rename to crates/irq_count/Cargo.toml index 7675d6ba..abd1f136 100644 --- a/modules/irq_count/Cargo.toml +++ b/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 b/crates/irq_count/src/lib.rs similarity index 100% rename from modules/irq_count/src/lib.rs rename to crates/irq_count/src/lib.rs diff --git a/modules/recycle_allocator/Cargo.toml b/crates/recycle_allocator/Cargo.toml similarity index 100% rename from modules/recycle_allocator/Cargo.toml rename to crates/recycle_allocator/Cargo.toml diff --git a/modules/recycle_allocator/src/lib.rs b/crates/recycle_allocator/src/lib.rs similarity index 100% rename from modules/recycle_allocator/src/lib.rs rename to crates/recycle_allocator/src/lib.rs diff --git a/driver/Cargo.toml b/driver/Cargo.toml index adbd72d1..9eb8fd24 100644 --- 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 index b4c6f6a5..b03372e4 100644 --- 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"