diff --git a/Cargo.lock b/Cargo.lock index 0958306..3471e1a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,13 +80,21 @@ dependencies = [ "cfg-if", "cortex-a", "fdt-rs", + "kernel-macros", "libsys", - "macros", "memfs", "tock-registers", "vfs", ] +[[package]] +name = "kernel-macros" +version = "0.1.0" +dependencies = [ + "quote", + "syn", +] + [[package]] name = "libsys" version = "0.1.0" @@ -101,14 +109,6 @@ dependencies = [ "libsys", ] -[[package]] -name = "macros" -version = "0.1.0" -dependencies = [ - "quote", - "syn", -] - [[package]] name = "memfs" version = "0.1.0" diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 8af6ab4..eee87ea 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -17,7 +17,7 @@ cfg-if = "1.x.x" tock-registers = "0.7.x" fdt-rs = { version = "0.x.x", default-features = false } bitflags = "^1.3.0" -macros = { path = "macros" } +kernel-macros = { path = "macros" } [target.'cfg(target_arch = "aarch64")'.dependencies] cortex-a = { version = "6.x.x" } diff --git a/kernel/macros/Cargo.toml b/kernel/macros/Cargo.toml index 7894fc4..fed4cd7 100644 --- a/kernel/macros/Cargo.toml +++ b/kernel/macros/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "macros" +name = "kernel-macros" version = "0.1.0" edition = "2021" diff --git a/kernel/src/main.rs b/kernel/src/main.rs index 277b093..b3f9efb 100644 --- a/kernel/src/main.rs +++ b/kernel/src/main.rs @@ -19,7 +19,7 @@ #![warn(missing_docs)] #[macro_use] -extern crate macros; +extern crate kernel_macros; #[macro_use] extern crate cfg_if; #[macro_use]