diff --git a/userspace/Cargo.lock b/userspace/Cargo.lock index 9b1fad04..329ebd67 100644 --- a/userspace/Cargo.lock +++ b/userspace/Cargo.lock @@ -16,55 +16,12 @@ dependencies = [ name = "abi-lib" version = "0.1.0" -[[package]] -name = "anstream" -version = "0.6.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - [[package]] name = "anstyle" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" -[[package]] -name = "anstyle-parse" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - [[package]] name = "arrayvec" version = "0.7.4" @@ -152,10 +109,8 @@ version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ - "anstream", "anstyle", "clap_lex", - "strsim", ] [[package]] @@ -176,12 +131,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" -[[package]] -name = "colorchoice" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" - [[package]] name = "colors" version = "0.1.0" @@ -377,12 +326,6 @@ dependencies = [ "yggdrasil-rt", ] -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - [[package]] name = "itoa" version = "1.0.10" @@ -850,12 +793,6 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - [[package]] name = "sw-composite" version = "0.7.16" @@ -931,6 +868,7 @@ name = "term" version = "0.1.0" dependencies = [ "bytemuck", + "clap", "libcolors", "thiserror", ] @@ -1064,12 +1002,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - [[package]] name = "version_check" version = "0.9.4" diff --git a/userspace/Cargo.toml b/userspace/Cargo.toml index 8cf616ea..b430f035 100644 --- a/userspace/Cargo.toml +++ b/userspace/Cargo.toml @@ -16,3 +16,20 @@ members = [ "rdb" ] exclude = ["dynload-program", "test-kernel-module"] + +[workspace.dependencies] +clap = { version = "4.3.19", features = ["std", "derive", "help", "usage"], default-features = false } +clap-num = "1.1.1" +serde_json = "1.0.111" +serde = { version = "1.0.193", features = ["derive"] } +bytemuck = "1.14.0" +thiserror = "1.0.56" +rand = { git = "https://git.alnyan.me/yggdrasil/rand.git", branch = "alnyan/yggdrasil" } +flexbuffers = "2.0.0" + +# Internal crates +serde-ipc.path = "lib/serde-ipc" +libterm.path = "lib/libterm" +libcolors = { path = "lib/libcolors", default-features = false } +yggdrasil-rt.path = "../lib/runtime" +yggdrasil-abi = { path = "../lib/abi", features = ["serde", "alloc", "bytemuck"] } diff --git a/userspace/colors/Cargo.toml b/userspace/colors/Cargo.toml index a1101a4b..066478ac 100644 --- a/userspace/colors/Cargo.toml +++ b/userspace/colors/Cargo.toml @@ -5,11 +5,11 @@ edition = "2021" authors = ["Mark Poliakov "] [dependencies] -yggdrasil-abi = { path = "../../lib/abi", features = ["serde"] } -serde-ipc = { path = "../lib/serde-ipc" } -libcolors = { path = "../lib/libcolors", default-features = false } +yggdrasil-abi.workspace = true +serde-ipc.workspace = true +serde.workspace = true +flexbuffers.workspace = true +thiserror.workspace = true +libcolors = { workspace = true, default-features = false } -flexbuffers = "2.0.0" lazy_static = "1.4.0" -serde = { version = "1.0.193", features = ["derive"] } -thiserror = "1.0.56" diff --git a/userspace/dyn-loader/Cargo.toml b/userspace/dyn-loader/Cargo.toml index 5e1682cb..58af2588 100644 --- a/userspace/dyn-loader/Cargo.toml +++ b/userspace/dyn-loader/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -yggdrasil-rt = { path = "../../lib/runtime" } +yggdrasil-rt.workspace = true +thiserror.workspace = true + elf = "0.7.4" -thiserror = "1.0.58" diff --git a/userspace/dynload-program/Cargo.toml b/userspace/dynload-program/Cargo.toml index 730e0095..b32c9c38 100644 --- a/userspace/dynload-program/Cargo.toml +++ b/userspace/dynload-program/Cargo.toml @@ -4,4 +4,4 @@ version = "0.1.0" edition = "2021" [dependencies] -yggdrasil-rt = { path = "../../lib/runtime" } +yggdrasil-rt.workspace = true diff --git a/userspace/init/Cargo.toml b/userspace/init/Cargo.toml index 00ff2fb7..0e95231c 100644 --- a/userspace/init/Cargo.toml +++ b/userspace/init/Cargo.toml @@ -15,6 +15,6 @@ name = "rc" path = "src/rc.rs" [dependencies] -serde = { version = "1.0.193", features = ["derive"] } -serde_json = "1.0.108" -yggdrasil-rt = { path = "../../lib/runtime" } +serde.workspace = true +serde_json.workspace = true +yggdrasil-rt.workspace = true diff --git a/userspace/lib/libcolors/Cargo.toml b/userspace/lib/libcolors/Cargo.toml index 778a7160..bd0e8622 100644 --- a/userspace/lib/libcolors/Cargo.toml +++ b/userspace/lib/libcolors/Cargo.toml @@ -5,11 +5,10 @@ edition = "2021" authors = ["Mark Poliakov "] [dependencies] -serde-ipc = { path = "../serde-ipc" } -yggdrasil-abi = { path = "../../../lib/abi", features = ["serde"] } - -serde = { version = "1.0.193", features = ["derive"] } -thiserror = "1.0.56" +serde-ipc.workspace = true +yggdrasil-abi.workspace = true +serde.workspace = true +thiserror.workspace = true # client_raqote raqote = { version = "0.8.3", default-features = false, optional = true } diff --git a/userspace/lib/libterm/Cargo.toml b/userspace/lib/libterm/Cargo.toml index a5937811..5ba6dd48 100644 --- a/userspace/lib/libterm/Cargo.toml +++ b/userspace/lib/libterm/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -thiserror = "1.0.50" +thiserror.workspace = true [target.'cfg(unix)'.dependencies] libc = "0.2.150" diff --git a/userspace/lib/serde-ipc/Cargo.toml b/userspace/lib/serde-ipc/Cargo.toml index 64587118..97e104d7 100644 --- a/userspace/lib/serde-ipc/Cargo.toml +++ b/userspace/lib/serde-ipc/Cargo.toml @@ -5,7 +5,8 @@ edition = "2021" authors = ["Mark Poliakov "] [dependencies] -flexbuffers = "2.0.0" -serde = { version = "1.0.193", features = ["derive"] } +flexbuffers.workspace = true +serde.workspace = true +thiserror.workspace = true + tempfile = "3.12.0" -thiserror = "1.0.56" diff --git a/userspace/netutils/Cargo.toml b/userspace/netutils/Cargo.toml index 23960819..15e65554 100644 --- a/userspace/netutils/Cargo.toml +++ b/userspace/netutils/Cargo.toml @@ -3,19 +3,17 @@ name = "netutils" version = "0.1.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -yggdrasil-abi = { path = "../../lib/abi", features = ["serde", "alloc", "bytemuck"] } +yggdrasil-abi.workspace = true +bytemuck.workspace = true +serde_json.workspace = true +serde.workspace = true +thiserror.workspace = true +clap.workspace = true +clap-num.workspace = true +rand.workspace = true -clap = { version = "4.3.19", features = ["std", "derive", "help", "usage"], default-features = false } -thiserror = "1.0.50" -bytemuck = { version = "1.14.0", features = ["derive"] } -serde = { version = "1.0.193", features = ["derive"] } -serde_json = "1.0.111" -rand = { git = "https://git.alnyan.me/yggdrasil/rand.git", branch = "alnyan/yggdrasil" } url = "2.5.0" -clap-num = "1.1.1" [lib] path = "src/lib.rs" diff --git a/userspace/rdb/Cargo.toml b/userspace/rdb/Cargo.toml index d00203a8..7e17f679 100644 --- a/userspace/rdb/Cargo.toml +++ b/userspace/rdb/Cargo.toml @@ -4,14 +4,14 @@ version = "0.1.0" edition = "2021" [dependencies] -clap = { version = "4.5.3", features = ["derive"] } -yggdrasil-rt = { path = "../../lib/runtime" } -yggdrasil-abi = { path = "../../lib/abi", features = ["serde"] } -libterm = { path = "../lib/libterm" } +serde_json.workspace = true +serde.workspace = true +clap.workspace = true +yggdrasil-rt.workspace = true +yggdrasil-abi.workspace = true +libterm.workspace = true +thiserror.workspace = true -serde_json = { version = "1.0.111", default-features = false, features = ["alloc"] } -serde = { version = "1.0.193", features = ["derive"], default-features = false } -thiserror = "1.0.58" elf = "0.7.4" rangemap = "1.5.1" rustc-demangle = "0.1.24" diff --git a/userspace/red/Cargo.toml b/userspace/red/Cargo.toml index b33de06d..c07e2dc6 100644 --- a/userspace/red/Cargo.toml +++ b/userspace/red/Cargo.toml @@ -7,9 +7,9 @@ authors = ["Mark Poliakov "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -libterm = { path = "../lib/libterm" } +libterm.workspace = true +thiserror.workspace = true -thiserror = "1.0.50" unicode-width = "0.1.11" [target.'cfg(not(target_os = "yggdrasil"))'.dependencies] diff --git a/userspace/shell/Cargo.toml b/userspace/shell/Cargo.toml index 9537b8ef..92eb49d1 100644 --- a/userspace/shell/Cargo.toml +++ b/userspace/shell/Cargo.toml @@ -4,11 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Mark Poliakov "] -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -clap = { version = "4.3.19", features = ["std", "derive"], default-features = false } -thiserror = "1.0.50" +clap.workspace = true +thiserror.workspace = true + nom = "7.1.3" [target.'cfg(target_os = "yggdrasil")'.dependencies] diff --git a/userspace/sysutils/Cargo.toml b/userspace/sysutils/Cargo.toml index 8bf83110..a1b49ed1 100644 --- a/userspace/sysutils/Cargo.toml +++ b/userspace/sysutils/Cargo.toml @@ -7,17 +7,17 @@ authors = ["Mark Poliakov "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -libterm = { path = "../lib/libterm" } -yggdrasil-abi = { path = "../../lib/abi", features = ["serde", "alloc", "bytemuck"] } -yggdrasil-rt = { path = "../../lib/runtime" } +rand.workspace = true +libterm.workspace = true +yggdrasil-abi.workspace = true +yggdrasil-rt.workspace = true +thiserror.workspace = true +clap.workspace = true +serde.workspace = true +serde_json.workspace = true -thiserror = "1.0.50" -clap = { version = "4.3.19", features = ["std", "derive", "help", "usage"], default-features = false } # TODO own impl humansize = { version = "2.1.3", features = ["impl_style"] } -rand = { git = "https://git.alnyan.me/yggdrasil/rand.git", branch = "alnyan/yggdrasil" } -serde = { version = "1.0.193", features = ["derive"] } -serde_json = "1.0.111" # sha2 = { version = "0.10.8" } init = { path = "../init" } diff --git a/userspace/term/Cargo.toml b/userspace/term/Cargo.toml index fa8dae91..e8fc5d6d 100644 --- a/userspace/term/Cargo.toml +++ b/userspace/term/Cargo.toml @@ -4,9 +4,8 @@ version = "0.1.0" edition = "2021" authors = ["Mark Poliakov "] -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -bytemuck = { version = "1.14.0", features = ["derive"] } -libcolors = { path = "../lib/libcolors", default-features = false, features = ["client"] } -thiserror = "1.0.56" +clap = { version = "4.3.19", features = ["std", "derive"], default-features = false } +bytemuck = { workspace = true, features = ["derive"] } +libcolors = { workspace = true, default-features = false, features = ["client"] } +thiserror.workspace = true