diff --git a/Cargo.lock b/Cargo.lock index e98134bff1..256d2bfade 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -351,9 +351,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.2.53" +version = "1.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755d2fce177175ffca841e9a06afdb2c4ab0f593d53b4dee48147dfaade85932" +checksum = "6354c81bbfd62d9cfa9cb3c773c2b7b2a3a482d569de977fd0e961f6e7c00583" dependencies = [ "find-msvc-tools", "shlex", @@ -411,18 +411,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.54" +version = "4.5.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394" +checksum = "a75ca66430e33a14957acc24c5077b503e7d374151b2b4b3a10c83b4ceb4be0e" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.54" +version = "4.5.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00" +checksum = "793207c7fa6300a0608d1080b858e5fdbe713cdc1c8db9fb17777d8a13e63df0" dependencies = [ "anstream", "anstyle", @@ -890,7 +890,7 @@ dependencies = [ [[package]] name = "generic-rt" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#3a8f64aa143184dc11fe1927a4f9e55c33ae3052" +source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#a32fd56e61ed209806995253f3e3f0954e35ca2f" [[package]] name = "getrandom" @@ -1019,9 +1019,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.64" +version = "0.1.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" +checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1557,9 +1557,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.105" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] @@ -1600,9 +1600,9 @@ checksum = "8bb0fd6580eeed0103c054e3fba2c2618ff476943762f28a645b63b8692b21c9" [[package]] name = "quote" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a" +checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" dependencies = [ "proc-macro2", ] @@ -1763,7 +1763,7 @@ version = "0.2.0" dependencies = [ "anyhow", "archive-common", - "clap 4.5.54", + "clap 4.5.56", "env_logger", "log", "plain", @@ -1774,7 +1774,7 @@ dependencies = [ [[package]] name = "redox-ioctl" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#3a8f64aa143184dc11fe1927a4f9e55c33ae3052" +source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#a32fd56e61ed209806995253f3e3f0954e35ca2f" dependencies = [ "drm-sys", "redox_syscall 0.7.0", @@ -1800,7 +1800,7 @@ checksum = "436d45c2b6a5b159d43da708e62b25be3a4a3d5550d654b72216ade4c4bfd717" [[package]] name = "redox-rt" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#3a8f64aa143184dc11fe1927a4f9e55c33ae3052" +source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#a32fd56e61ed209806995253f3e3f0954e35ca2f" dependencies = [ "bitflags 2.10.0", "generic-rt", @@ -1823,9 +1823,9 @@ dependencies = [ [[package]] name = "redox_event" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c30b73c93693667b5a8e6f54bddcc5a57449ef17c99f4b55c12d5bae4ab79e82" +checksum = "e262c10ea0aa8a5e98968e3d23dda814dbefe1f3409e39bf29e99da1236e9b43" dependencies = [ "bitflags 2.10.0", "libredox", @@ -2435,6 +2435,7 @@ dependencies = [ name = "usbhidd" version = "0.1.0" dependencies = [ + "anyhow", "bitflags 2.10.0", "common", "inputd", @@ -2484,9 +2485,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a" +checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f" dependencies = [ "getrandom 0.3.4", "js-sys", @@ -2829,18 +2830,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.33" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd" +checksum = "fdea86ddd5568519879b8187e1cf04e24fce28f7fe046ceecbce472ff19a2572" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.33" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1" +checksum = "0c15e1b46eff7c6c91195752e0eeed8ef040e391cdece7c25376957d5f15df22" dependencies = [ "proc-macro2", "quote", @@ -2859,6 +2860,6 @@ dependencies = [ [[package]] name = "zmij" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfcd145825aace48cff44a8844de64bf75feec3080e0aa5cdbde72961ae51a65" +checksum = "02aae0f83f69aafc94776e879363e9771d7ecbffe2c7fbb6c14c5e00dfe88439" diff --git a/Cargo.toml b/Cargo.toml index c13bfb7234..ce2e26f7a5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,6 +74,7 @@ exclude = ["bootstrap"] # Low-level Redox OS crates should be kept in sync using workspace dependencies # Remember to also update bootstrap dependencies, those are not in the workspace [workspace.dependencies] +anyhow = "1" libc = "0.2.180" log = "0.4" libredox = "0.1.12" diff --git a/audiod/Cargo.toml b/audiod/Cargo.toml index 915a385051..2f725ce592 100644 --- a/audiod/Cargo.toml +++ b/audiod/Cargo.toml @@ -10,5 +10,5 @@ redox_syscall = { workspace = true, features = ["std"] } libc.workspace = true libredox = { workspace = true, features = ["mkns"] } redox-scheme.workspace = true -anyhow = "1.0.97" +anyhow.workspace = true ioslice = "0.6.0" diff --git a/drivers/graphics/virtio-gpud/Cargo.toml b/drivers/graphics/virtio-gpud/Cargo.toml index 9a30d0a57b..6cac0bfd02 100644 --- a/drivers/graphics/virtio-gpud/Cargo.toml +++ b/drivers/graphics/virtio-gpud/Cargo.toml @@ -11,7 +11,7 @@ edid = "0.3.0" log.workspace = true static_assertions = "1.1.0" futures = { version = "0.3.28", features = ["executor"] } -anyhow = "1.0.71" +anyhow.workspace = true common = { path = "../../common" } daemon = { path = "../../../daemon" } diff --git a/drivers/input/usbhidd/Cargo.toml b/drivers/input/usbhidd/Cargo.toml index 989b5cf55d..a502579541 100644 --- a/drivers/input/usbhidd/Cargo.toml +++ b/drivers/input/usbhidd/Cargo.toml @@ -8,6 +8,7 @@ license = "MIT" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +anyhow.workspace = true bitflags = "2" log.workspace = true orbclient.workspace = true diff --git a/drivers/input/usbhidd/src/main.rs b/drivers/input/usbhidd/src/main.rs index bbe0f504a6..28e00496eb 100644 --- a/drivers/input/usbhidd/src/main.rs +++ b/drivers/input/usbhidd/src/main.rs @@ -153,7 +153,7 @@ fn send_key_event(display: &mut ProducerHandle, usage_page: u16, usage: u16, pre } } -fn main() { +fn main() -> Result<(), Box> { let mut args = env::args().skip(1); const USAGE: &'static str = "usbhidd "; diff --git a/drivers/inputd/Cargo.toml b/drivers/inputd/Cargo.toml index 79a349e6ca..a1ad7b6923 100644 --- a/drivers/inputd/Cargo.toml +++ b/drivers/inputd/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" authors = ["Anhad Singh "] [dependencies] -anyhow = "1.0.71" +anyhow.workspace = true log.workspace = true redox_syscall = { workspace = true, features = ["std"] } orbclient.workspace = true diff --git a/drivers/pcid-spawner/Cargo.toml b/drivers/pcid-spawner/Cargo.toml index fe9d4907bd..3f25a546db 100644 --- a/drivers/pcid-spawner/Cargo.toml +++ b/drivers/pcid-spawner/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "MIT" [dependencies] -anyhow = "1" +anyhow.workspace = true log.workspace = true pico-args = "0.5" redox_syscall.workspace = true diff --git a/drivers/redoxerd/Cargo.toml b/drivers/redoxerd/Cargo.toml index b8bd8afadf..3a1d7be88f 100644 --- a/drivers/redoxerd/Cargo.toml +++ b/drivers/redoxerd/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Jeremy Soller "] edition = "2018" [dependencies] -anyhow = "1.0" +anyhow.workspace = true libredox.workspace = true redox_event.workspace = true redox_syscall.workspace = true diff --git a/drivers/rtcd/Cargo.toml b/drivers/rtcd/Cargo.toml index a6b9587872..cc64d18061 100644 --- a/drivers/rtcd/Cargo.toml +++ b/drivers/rtcd/Cargo.toml @@ -7,6 +7,6 @@ license = "MIT" [dependencies] -anyhow = "1" +anyhow.workspace = true common = { path = "../common" } diff --git a/drivers/storage/lived/Cargo.toml b/drivers/storage/lived/Cargo.toml index 61ed7e8649..3d7d607618 100644 --- a/drivers/storage/lived/Cargo.toml +++ b/drivers/storage/lived/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1" +anyhow.workspace = true libredox.workspace = true daemon = { path = "../../../daemon" } redox_syscall = { workspace = true, features = ["std"] } diff --git a/drivers/storage/virtio-blkd/Cargo.toml b/drivers/storage/virtio-blkd/Cargo.toml index 100a33ec31..56f8b95840 100644 --- a/drivers/storage/virtio-blkd/Cargo.toml +++ b/drivers/storage/virtio-blkd/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" authors = ["Anhad Singh "] [dependencies] -anyhow = "1.0.71" +anyhow.workspace = true log.workspace = true thiserror = "1.0.40" static_assertions = "1.1.0" diff --git a/initfs/Cargo.toml b/initfs/Cargo.toml index 36c522d7b5..b7a4fb48da 100644 --- a/initfs/Cargo.toml +++ b/initfs/Cargo.toml @@ -17,7 +17,7 @@ std = [] [dev-dependencies] # FIXME remove loggers -anyhow = "1" +anyhow.workspace = true archive-common = {path = "archive-common"} env_logger = "0.8" log.workspace = true diff --git a/initfs/archive-common/Cargo.toml b/initfs/archive-common/Cargo.toml index f4a17224c0..04b681190c 100644 --- a/initfs/archive-common/Cargo.toml +++ b/initfs/archive-common/Cargo.toml @@ -5,7 +5,7 @@ authors = ["4lDO2 <4lDO2@protonmail.com>", "Kamil Koczurek edition = "2021" [dependencies] -anyhow = "1" +anyhow.workspace = true log.workspace = true pathdiff = "0.2.1" plain = "0.2" diff --git a/initfs/tools/Cargo.toml b/initfs/tools/Cargo.toml index 4b01bd06d5..8305e5cc36 100644 --- a/initfs/tools/Cargo.toml +++ b/initfs/tools/Cargo.toml @@ -17,7 +17,7 @@ name = "redox-initfs-dump" path = "src/bin/dump.rs" [dependencies] -anyhow = "1" +anyhow.workspace = true clap = {version = "4", features = ["cargo"]} env_logger = "0.8" log.workspace = true diff --git a/ipcd/Cargo.toml b/ipcd/Cargo.toml index 235712f4ad..e740842641 100644 --- a/ipcd/Cargo.toml +++ b/ipcd/Cargo.toml @@ -9,7 +9,7 @@ daemon = { path = "../daemon" } redox_syscall.workspace = true redox-scheme.workspace = true redox_event.workspace = true -anyhow = "1.0.97" +anyhow.workspace = true libc.workspace = true rand = { version = "0.8", features = ["small_rng"] } diff --git a/netstack/Cargo.toml b/netstack/Cargo.toml index 77e2d17d99..e730881f91 100644 --- a/netstack/Cargo.toml +++ b/netstack/Cargo.toml @@ -13,7 +13,7 @@ daemon = { path = "../daemon" } redox_syscall = { workspace = true, features = ["std"] } redox-log.workspace = true libredox = { workspace = true, features = ["mkns"] } -anyhow = "1.0.81" +anyhow.workspace = true redox-scheme.workspace = true [dependencies.log]