alnyan/osdev5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: rename macros -> kernel-macros

Browse Source
This commit is contained in:
Mark Poliakov 2021-11-11 22:09:55 +02:00
parent dd8033b51c
commit 94c2fc3c82
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Cargo.lock generated
View File

@ -80,13 +80,21 @@ dependencies = [
"cfg-if", "cfg-if",
"cortex-a", "cortex-a",
"fdt-rs", "fdt-rs",
"kernel-macros",
"libsys", "libsys",
"macros",
"memfs", "memfs",
"tock-registers", "tock-registers",
"vfs", "vfs",
] ]
[[package]]
name = "kernel-macros"
version = "0.1.0"
dependencies = [
"quote",
"syn",
]
[[package]] [[package]]
name = "libsys" name = "libsys"
version = "0.1.0" version = "0.1.0"
@ -101,14 +109,6 @@ dependencies = [
"libsys", "libsys",
] ]
[[package]]
name = "macros"
version = "0.1.0"
dependencies = [
"quote",
"syn",
]
[[package]] [[package]]
name = "memfs" name = "memfs"
version = "0.1.0" version = "0.1.0"

2
kernel/Cargo.toml
View File

@ -17,7 +17,7 @@ cfg-if = "1.x.x"
tock-registers = "0.7.x" tock-registers = "0.7.x"
fdt-rs = { version = "0.x.x", default-features = false } fdt-rs = { version = "0.x.x", default-features = false }
bitflags = "^1.3.0" bitflags = "^1.3.0"
macros = { path = "macros" } kernel-macros = { path = "macros" }
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "6.x.x" } cortex-a = { version = "6.x.x" }

2
kernel/macros/Cargo.toml
View File

@ -1,5 +1,5 @@
[package] [package]
name = "macros" name = "kernel-macros"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2021"

2
kernel/src/main.rs
View File

@ -19,7 +19,7 @@
#![warn(missing_docs)] #![warn(missing_docs)]
#[macro_use] #[macro_use]
extern crate macros; extern crate kernel_macros;
#[macro_use] #[macro_use]
extern crate cfg_if; extern crate cfg_if;
#[macro_use] #[macro_use]