diff --git a/Cargo.lock b/Cargo.lock index 607922baf0..6c8ae67e2b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1327,7 +1327,6 @@ checksum = "6aa2c4e539b869820a2b82e1aef6ff40aa85e65decdd5185e83fb4b1249cd00f" name = "nvmed" version = "0.1.0" dependencies = [ - "arrayvec", "bitflags 2.11.0", "common", "daemon", diff --git a/Cargo.toml b/Cargo.toml index 0162fa52cd..2440bd6762 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -78,10 +78,16 @@ bitflags = "2" clap = "4" drm = "0.14.2" drm-sys = "0.8.1" +edid = "0.3.0" #TODO: edid is abandoned, fork it and maintain? +fdt = "0.1.5" libc = "0.2.181" log = "0.4" libredox = "0.1.14" orbclient = "0.3.51" +parking_lot = "0.12" +pico-args = "0.5" +plain = "0.2.3" +ransid = "0.4" redox_event = "0.4.6" redox-ioctl = { git = "https://gitlab.redox-os.org/redox-os/relibc.git" } redox-log = { git = "https://gitlab.redox-os.org/redox-os/redox-log.git" } @@ -89,7 +95,12 @@ redox-rt = { git = "https://gitlab.redox-os.org/redox-os/relibc.git", default-fe redox-scheme = "0.11.0" redox_syscall = "0.7.3" redox_termios = "0.1.3" +ron = "0.8.1" serde = { version = "1", features = ["derive"] } +serde_json = "1" +slab = "0.4.9" +smallvec = "1" +static_assertions = "1.1.0" toml = "1" [workspace.lints.clippy] diff --git a/drivers/acpid/Cargo.toml b/drivers/acpid/Cargo.toml index 1e55251011..b1dcebafcb 100644 --- a/drivers/acpid/Cargo.toml +++ b/drivers/acpid/Cargo.toml @@ -9,17 +9,17 @@ edition = "2018" [dependencies] acpi = { git = "https://github.com/jackpot51/acpi.git" } +arrayvec = "0.7.6" log.workspace = true num-derive = "0.3" num-traits = "0.2" -parking_lot = "0.12" -plain = "0.2.3" +parking_lot.workspace = true +plain.workspace = true redox_syscall.workspace = true redox_event.workspace = true rustc-hash = "1.1.0" thiserror = "1" -ron = "0.8.1" -arrayvec = "0.7.6" +ron.workspace = true serde.workspace = true amlserde = { path = "../amlserde" } diff --git a/drivers/executor/Cargo.toml b/drivers/executor/Cargo.toml index 094d1beb51..a910e3c24e 100644 --- a/drivers/executor/Cargo.toml +++ b/drivers/executor/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT" [dependencies] log.workspace = true redox_event.workspace = true -slab = "0.4.9" +slab.workspace = true [lints] workspace = true diff --git a/drivers/graphics/console-draw/Cargo.toml b/drivers/graphics/console-draw/Cargo.toml index 57578a17bb..c92a7b9f42 100644 --- a/drivers/graphics/console-draw/Cargo.toml +++ b/drivers/graphics/console-draw/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] drm.workspace = true orbclient.workspace = true -ransid = "0.4" +ransid.workspace = true graphics-ipc = { path = "../graphics-ipc" } diff --git a/drivers/graphics/driver-graphics/Cargo.toml b/drivers/graphics/driver-graphics/Cargo.toml index 93422cefff..7f90a93eb6 100644 --- a/drivers/graphics/driver-graphics/Cargo.toml +++ b/drivers/graphics/driver-graphics/Cargo.toml @@ -7,8 +7,7 @@ edition = "2021" [dependencies] drm-fourcc = "2.2.0" drm-sys.workspace = true -#TODO: edid is abandoned, fork it an maintain? -edid = "0.3.0" +edid.workspace = true #TODO: edid is abandoned, fork it and maintain? log.workspace = true redox-ioctl.workspace = true redox-scheme.workspace = true diff --git a/drivers/graphics/fbbootlogd/Cargo.toml b/drivers/graphics/fbbootlogd/Cargo.toml index e1d07182cf..0163da81d9 100644 --- a/drivers/graphics/fbbootlogd/Cargo.toml +++ b/drivers/graphics/fbbootlogd/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] drm.workspace = true orbclient.workspace = true -ransid = "0.4" +ransid.workspace = true redox_event.workspace = true redox_syscall.workspace = true redox-scheme.workspace = true diff --git a/drivers/graphics/fbcond/Cargo.toml b/drivers/graphics/fbcond/Cargo.toml index be48ecc82e..a4431bba57 100644 --- a/drivers/graphics/fbcond/Cargo.toml +++ b/drivers/graphics/fbcond/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" drm.workspace = true log.workspace = true orbclient.workspace = true -ransid = "0.4" +ransid.workspace = true redox_event.workspace = true redox_syscall.workspace = true redox-scheme.workspace = true diff --git a/drivers/graphics/ihdgd/Cargo.toml b/drivers/graphics/ihdgd/Cargo.toml index 7b9d5778d0..25d04eac8b 100644 --- a/drivers/graphics/ihdgd/Cargo.toml +++ b/drivers/graphics/ihdgd/Cargo.toml @@ -7,8 +7,7 @@ edition = "2021" [dependencies] bitbang-hal = "0.3" drm-sys.workspace = true -#TODO: edid is abandoned, fork it an maintain? -edid = "0.3.0" +edid.workspace = true #TODO: edid is abandoned, fork it and maintain? #TODO: waiting for bitbang-hal to update to embedded-hal 1.0 embedded-hal = { version = "0.2.7", features = ["unproven"] } log.workspace = true diff --git a/drivers/graphics/vesad/Cargo.toml b/drivers/graphics/vesad/Cargo.toml index fe5fc64018..a248b31488 100644 --- a/drivers/graphics/vesad/Cargo.toml +++ b/drivers/graphics/vesad/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] drm-sys.workspace = true orbclient.workspace = true -ransid = "0.4" +ransid.workspace = true redox_syscall.workspace = true redox_event.workspace = true diff --git a/drivers/graphics/virtio-gpud/Cargo.toml b/drivers/graphics/virtio-gpud/Cargo.toml index cd015f7c86..6b7abfd450 100644 --- a/drivers/graphics/virtio-gpud/Cargo.toml +++ b/drivers/graphics/virtio-gpud/Cargo.toml @@ -8,7 +8,7 @@ authors = ["Anhad Singh "] [dependencies] drm-sys.workspace = true log.workspace = true -static_assertions = "1.1.0" +static_assertions.workspace = true futures = { version = "0.3.28", features = ["executor"] } anyhow.workspace = true diff --git a/drivers/hwd/Cargo.toml b/drivers/hwd/Cargo.toml index f7565c5330..3d37cfb3f3 100644 --- a/drivers/hwd/Cargo.toml +++ b/drivers/hwd/Cargo.toml @@ -5,9 +5,9 @@ version = "0.1.0" edition = "2018" [dependencies] -fdt = "0.1.5" +fdt.workspace = true log.workspace = true -ron = "0.8.1" +ron.workspace = true libredox = { workspace = true, default-features = false, features = ["std", "call"] } amlserde = { path = "../amlserde" } diff --git a/drivers/net/virtio-netd/Cargo.toml b/drivers/net/virtio-netd/Cargo.toml index ef0be562fb..f8e943f3d8 100644 --- a/drivers/net/virtio-netd/Cargo.toml +++ b/drivers/net/virtio-netd/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] log.workspace = true -static_assertions = "1.1.0" +static_assertions.workspace = true futures = { version = "0.3.28", features = ["executor"] } virtio-core = { path = "../../virtio-core" } diff --git a/drivers/pcid-spawner/Cargo.toml b/drivers/pcid-spawner/Cargo.toml index 17a6bfa864..8c03f8d33a 100644 --- a/drivers/pcid-spawner/Cargo.toml +++ b/drivers/pcid-spawner/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT" [dependencies] anyhow.workspace = true log.workspace = true -pico-args = "0.5" +pico-args.workspace = true redox_syscall.workspace = true serde.workspace = true toml.workspace = true diff --git a/drivers/pcid/Cargo.toml b/drivers/pcid/Cargo.toml index 7a889447b8..cfa4125830 100644 --- a/drivers/pcid/Cargo.toml +++ b/drivers/pcid/Cargo.toml @@ -14,12 +14,12 @@ path = "src/lib.rs" [dependencies] bincode = "1.2" -fdt = "0.1.5" +fdt.workspace = true libc.workspace = true log.workspace = true pci_types = "0.10.1" -pico-args = { version = "0.5", features = ["combined-flags"] } -plain = "0.2" +pico-args = { workspace = true, features = ["combined-flags"] } +plain.workspace = true redox-scheme.workspace = true redox_syscall.workspace = true serde.workspace = true diff --git a/drivers/storage/nvmed/Cargo.toml b/drivers/storage/nvmed/Cargo.toml index 9447368835..69e8438133 100644 --- a/drivers/storage/nvmed/Cargo.toml +++ b/drivers/storage/nvmed/Cargo.toml @@ -5,15 +5,14 @@ version = "0.1.0" edition = "2021" [dependencies] -arrayvec = "0.7" bitflags.workspace = true futures = "0.3" libredox.workspace = true log.workspace = true -parking_lot = "0.12.1" +parking_lot.workspace = true redox_event.workspace = true redox_syscall = { workspace = true, features = ["std"] } -smallvec = "1" +smallvec.workspace = true executor = { path = "../../executor" } common = { path = "../../common" } diff --git a/drivers/storage/usbscsid/Cargo.toml b/drivers/storage/usbscsid/Cargo.toml index c97ec68fe5..429e6ed52d 100644 --- a/drivers/storage/usbscsid/Cargo.toml +++ b/drivers/storage/usbscsid/Cargo.toml @@ -11,7 +11,7 @@ license = "MIT" [dependencies] base64 = "0.11" # Only for debugging libredox.workspace = true -plain = "0.2" +plain.workspace = true driver-block = { path = "../driver-block" } daemon = { path = "../../../daemon" } redox_event.workspace = true diff --git a/drivers/storage/virtio-blkd/Cargo.toml b/drivers/storage/virtio-blkd/Cargo.toml index d189f8b2e1..85408c0032 100644 --- a/drivers/storage/virtio-blkd/Cargo.toml +++ b/drivers/storage/virtio-blkd/Cargo.toml @@ -9,7 +9,7 @@ authors = ["Anhad Singh "] anyhow.workspace = true log.workspace = true thiserror = "1.0.40" -static_assertions = "1.1.0" +static_assertions.workspace = true futures = { version = "0.3.28", features = ["executor"] } spin = "*" diff --git a/drivers/usb/xhcid/Cargo.toml b/drivers/usb/xhcid/Cargo.toml index f897dbae89..18d17f4e01 100644 --- a/drivers/usb/xhcid/Cargo.toml +++ b/drivers/usb/xhcid/Cargo.toml @@ -17,15 +17,15 @@ bitflags.workspace = true chashmap = "2.2.2" crossbeam-channel = "0.4" futures = "0.3" -plain = "0.2" +plain.workspace = true lazy_static = "1.4" log.workspace = true redox_event.workspace = true redox-scheme.workspace = true redox_syscall.workspace = true serde.workspace = true -serde_json = "1" -smallvec = { version = "1", features = ["serde"] } +serde_json.workspace = true +smallvec = { workspace = true, features = ["serde"] } thiserror = "1" toml.workspace = true diff --git a/drivers/virtio-core/Cargo.toml b/drivers/virtio-core/Cargo.toml index 27b9da0481..5ce6b96c07 100644 --- a/drivers/virtio-core/Cargo.toml +++ b/drivers/virtio-core/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" authors = ["Anhad Singh "] [dependencies] -static_assertions = "1.1.0" +static_assertions.workspace = true bitflags.workspace = true redox_syscall.workspace = true libredox.workspace = true diff --git a/init/Cargo.toml b/init/Cargo.toml index 213f37cdcb..0a5bde7248 100644 --- a/init/Cargo.toml +++ b/init/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT" [dependencies] libredox.workspace = true serde.workspace = true -serde_json = "1" +serde_json.workspace = true toml.workspace = true config = { path = "../config" } diff --git a/initfs/Cargo.toml b/initfs/Cargo.toml index dae41ba8d8..8b2da874ea 100644 --- a/initfs/Cargo.toml +++ b/initfs/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -plain = "0.2" +plain.workspace = true [lints] workspace = true diff --git a/initfs/tools/Cargo.toml b/initfs/tools/Cargo.toml index 278cd68495..6c79d8300e 100644 --- a/initfs/tools/Cargo.toml +++ b/initfs/tools/Cargo.toml @@ -22,7 +22,7 @@ clap = {workspace = true, features = ["cargo"]} env_logger = "0.8" log.workspace = true pathdiff = "0.2.1" -plain = "0.2" +plain.workspace = true twox-hash = "1.6" redox-initfs = {path = ".."} diff --git a/ramfs/Cargo.toml b/ramfs/Cargo.toml index fcb79604d5..197a939fc6 100644 --- a/ramfs/Cargo.toml +++ b/ramfs/Cargo.toml @@ -14,7 +14,7 @@ redox_syscall.workspace = true redox-scheme.workspace = true libredox = { workspace = true, features = ["call"] } indexmap = "2.5.0" -slab = "0.4.9" +slab.workspace = true [lints] workspace = true