*: Move common dependencies to workspace

Author: marv7000

Cargo.toml

@@ -12,6 +12,11 @@ members = [
 
 [workspace.dependencies]
 zinnia = { path = "kernel" }
+num_enum = { version = "0.7.6", default-features = false }
+intrusive-collections = { version = "0.10.1", features = ["nightly"] }
+bitflags = "2.10.0"
+cfg-if = "1.0.4"
+seq-macro = "0.3.6"
 
 [profile.dev]
 panic = "abort"

kernel/Cargo.toml

@@ -13,15 +13,16 @@ kernel_proc = { path = "crates/kernel_proc" }
 uacpi-sys = { path = "../bindings/uacpi" }
 flanterm-sys = { path = "../bindings/flanterm" }
 
-bitflags = "2.10.0"
-cfg-if = "1.0.4"
-seq-macro = "0.3.6"
+bitflags = { workspace = true }
+cfg-if = { workspace = true }
+seq-macro = { workspace = true }
 bytemuck = { version = "1.24.0", features = ["derive", "min_const_generics"] }
 num-traits = { version = "0.2.19", default-features = false }
 limine = { version = "0.5.0", optional = true }
 rustc-demangle = { version = "0.1.26" }
-intrusive-collections = { version = "0.9.7", features = ["nightly"] }
+intrusive-collections = { workspace = true }
 paste = "1.0.15"
+num_enum = { workspace = true }
 
 [features]
 default = ["acpi", "boot_limine"]

kernel/crates/initgraph/Cargo.toml

@@ -5,5 +5,5 @@ edition = "2024"
 
 [dependencies]
 initgraph_proc = { path = "../initgraph_proc" }
-intrusive-collections = { version = "0.9.7", features = ["nightly"] }
+intrusive-collections = { workspace = true }
 spin = "0.10.0"

kernel/crates/initgraph/src/lib.rs

@@ -6,9 +6,9 @@ use spin::{Mutex, MutexGuard};
 
 pub use initgraph_proc::*;
 
-intrusive_adapter!(pub InLinkAdapter = &'static Edge: Edge { in_link: LinkedListLink });
-intrusive_adapter!(pub OutLinkAdapter = &'static Edge: Edge { out_link: LinkedListLink });
-intrusive_adapter!(pub PendingLinkAdapter = &'static Node: Node { pending_link: LinkedListLink });
+intrusive_adapter!(pub InLinkAdapter = &'static Edge: Edge { in_link => LinkedListLink });
+intrusive_adapter!(pub OutLinkAdapter = &'static Edge: Edge { out_link => LinkedListLink });
+intrusive_adapter!(pub PendingLinkAdapter = &'static Node: Node { pending_link => LinkedListLink });
 
 pub struct Edge {
     source: &'static Node,

kernel/src/lib.rs

@@ -22,6 +22,11 @@ pub extern crate alloc;
 #[macro_use]
 pub extern crate core;
 
+pub use bitflags;
+pub use num_enum;
+pub use num_traits;
+pub use rustc_demangle;
+
 #[macro_use]
 pub mod macros;
 pub mod arch;

kernel/src/util/event.rs

@@ -9,7 +9,7 @@ pub struct Waiter {
     task: Arc<Task>,
 }
 
-intrusive_adapter!(WaitersLinkAdapter = UnsafeRef<Waiter>: Waiter { waiters_link: LinkedListAtomicLink });
+intrusive_adapter!(WaitersLinkAdapter = UnsafeRef<Waiter>: Waiter { waiters_link => LinkedListAtomicLink });
 
 #[derive(Debug)]
 pub struct Event {

kernel/src/util/mutex/mod.rs

@@ -10,7 +10,7 @@ use intrusive_collections::{LinkedList, LinkedListAtomicLink, UnsafeRef, intrusi
 
 pub mod spin;
 
-intrusive_adapter!(WaitersLinkAdapter = UnsafeRef<Waiter>: Waiter { waiters_link: LinkedListAtomicLink });
+intrusive_adapter!(WaitersLinkAdapter = UnsafeRef<Waiter>: Waiter { waiters_link => LinkedListAtomicLink });
 
 struct Waiter {
     waiters_link: LinkedListAtomicLink,