From 244d61c2809fca2400a303fd687556606e3faf9d Mon Sep 17 00:00:00 2001 From: Mario Voigt Date: Mon, 17 Feb 2025 01:15:03 +0100 Subject: [PATCH] Update all Rust dependencies to the latest possible --- Cargo.toml | 101 ++++++++++++++++---------------- Cross.toml | 29 +++++++++ api/Cargo.toml | 8 +-- modules/sdk/Cargo.toml | 2 +- modules/sdk/sdk_proc/Cargo.toml | 8 +-- runtime/console/Cargo.toml | 38 ++++++------ runtime/executor/Cargo.toml | 42 ++++++------- runtime/lightproc/Cargo.toml | 14 ++--- rust-toolchain.toml | 2 +- 9 files changed, 137 insertions(+), 107 deletions(-) create mode 100644 Cross.toml diff --git a/Cargo.toml b/Cargo.toml index 1812c74..4eda034 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,8 @@ [package] name = "difluoroborane" -version = "0.4.2" -authors = [ "dequbed " +version = "0.4.4" +authors = [ "Jonathan Krebs " + , "dequbed " , "Kai Jan Kriegel " , "Joseph Langosch " , "Jannis Rieger " @@ -29,23 +30,23 @@ path = "bin/bffhd/main.rs" test = false [dependencies] -libc = "0.2.101" -nix = "0.23.1" -uuid = { version = "0.8.2", features = ["serde", "v4"] } -async-trait = "0.1.51" +libc = "0.2.169" +nix = "0.29.0" +uuid = { version = "1.13.1", features = ["serde", "v4"] } +async-trait = "0.1.86" pin-utils = "0.1.0" -futures-util = "0.3" -futures-lite = "1.12.0" -async-net = "1.6.1" -async-io = "1.7.0" -async-process = "1.4.0" -backtrace = "0.3.65" -miette = { version = "4.7.1", features = ["fancy"] } -thiserror = "1.0.31" -toml = "0.5.8" +futures-util = "0.3.31" +futures-lite = "2.6.0" +async-net = "2.0.0" +async-io = "2.4.0" +async-process = "2.3.0" +backtrace = "0.3.74" +miette = { version = "7.5.0", features = ["fancy"] } +thiserror = "2.0.11" +toml = "0.5.11" # Well-known paths/dirs for e.g. cache -dirs = "4.0.0" +dirs = "6.0.0" # Runtime executor = { path = "runtime/executor" } @@ -53,64 +54,64 @@ lightproc = { path = "runtime/lightproc" } console = { path = "runtime/console" } # Catch&Handle POSIX process signals -signal-hook = "0.3.13" +signal-hook = "0.3.17" signal-hook-async-std = "0.2.2" # Argument parsing for bin/bffhd.rs -clap = { version = "3.1.6", features = ["cargo"] } +clap = { version = "3.2.22", features = ["cargo"] } # Internal Databases lmdb-rkv = "0.14.0" -rkyv = { version = "0.7", features = [] } -ptr_meta = "0.1" -rkyv_typename = "0.7" -rkyv_dyn = "0.7" -inventory = "0.1" -linkme = "0.3" -chrono = { version = "0.4", features = ["serde"] } +rkyv = { version = "0.7.45", features = [] } +ptr_meta = "0.1.4" +rkyv_typename = "0.7.44" +rkyv_dyn = "0.7.44" +inventory = "0.3.19" +linkme = "0.3.31" +chrono = { version = "0.4.39", features = ["serde"] } # Password hashing for internal users -rust-argon2 = "0.8.3" +rust-argon2 = "2.1.0" rand = "0.8.4" # Async aware logging and tracing -tracing = "0.1" -tracing-subscriber = { version = "0.3", features = ["env-filter", "registry", "std"] } -tracing-futures = { version = "0.2", features = ["futures-03"] } +tracing = "0.1.41" +tracing-subscriber = { version = "0.3.19", features = ["env-filter", "registry", "std"] } +tracing-futures = { version = "0.2.5", features = ["futures-03"] } # API api = { path = "api" } -capnp = "0.14" -capnp-rpc = "0.14.1" +capnp = "0.16.1" +capnp-rpc = "0.16.2" # API Authentication desfire = "0.2.0-alpha3" hex = { version = "0.4.3", features = ["serde"] } -futures-signals = "0.3.22" -async-oneshot = "0.5" -async-channel = "1.6" +futures-signals = "0.3.34" +async-oneshot = "0.5.9" +async-channel = "2.3.1" # Config and Database (De)Serialization -serde = { version = "1.0.130", features = ["derive"] } -erased-serde = "0.3" -serde_dhall = { version = "0.10.1", default-features = false } -serde_json = "1.0" +serde = { version = "1.0.217", features = ["derive"] } +erased-serde = "0.4.5" +serde_dhall = { version = "0.12.1", default-features = false } +serde_json = "1.0.138" -once_cell = "1.8" -lazy_static = "1.4.0" +once_cell = "1.20.3" +lazy_static = "1.5.0" -rustls = "0.20" -rustls-pemfile = "0.3.0" -futures-rustls = "0.22" +rustls = "0.20.9" +rustls-pemfile = "1.0.4" +futures-rustls = "0.22.2" rumqttc = "0.11.0" -async-compat = "0.2.1" -url = "2.2.2" -rustls-native-certs = "0.6.1" +async-compat = "0.2.4" +url = "2.5.4" +rustls-native-certs = "0.6.3" -shadow-rs = "0.11" +shadow-rs = "0.38.1" [dependencies.rsasl] version = "2.2.0" @@ -118,11 +119,11 @@ default_features = false features = ["unstable_custom_mechanism", "provider", "registry_static", "config_builder", "plain"] [dev-dependencies] -futures-test = "0.3.16" -tempfile = "3.2" +futures-test = "0.3.31" +tempfile = "3.16" [build-dependencies] -shadow-rs = "0.11" +shadow-rs = "0.38.1" [workspace] members = ["runtime/*", "modules/*", "api"] diff --git a/Cross.toml b/Cross.toml new file mode 100644 index 0000000..698c541 --- /dev/null +++ b/Cross.toml @@ -0,0 +1,29 @@ +[target.x86_64-unknown-linux-gnu] +pre-build = [ + "apt-get update && apt-get install --assume-yes capnproto" +] + +[target.aarch64-unknown-linux-gnu] +pre-build = [ + "apt-get update && apt-get install --assume-yes capnproto" +] + +[target.arm-unknown-linux-gnueabi] +pre-build = [ + "apt-get update && apt-get install --assume-yes capnproto" +] + +[target.arm-unknown-linux-gnueabihf] +pre-build = [ + "apt-get update && apt-get install --assume-yes capnproto" +] + +[target.armv7-unknown-linux-gnueabihf] +pre-build = [ + "apt-get update && apt-get install --assume-yes capnproto" +] + +[target.x86_64-pc-windows-gnu] +pre-build = [ + "apt-get update && apt-get install --assume-yes capnproto" +] diff --git a/api/Cargo.toml b/api/Cargo.toml index 3584279..a5b33f6 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -10,10 +10,10 @@ generated = [] gen_static = [] [dependencies] -capnp = "0.14.3" -capnpc = "0.14.4" +capnp = "0.16.1" +capnpc = "0.16.5" [build-dependencies] -capnpc = "0.14.4" +capnpc = "0.16.5" # Used in build.rs to iterate over all files in schema/ -walkdir = "2.3.2" \ No newline at end of file +walkdir = "2.5.0" diff --git a/modules/sdk/Cargo.toml b/modules/sdk/Cargo.toml index 7f19865..8e3cccf 100644 --- a/modules/sdk/Cargo.toml +++ b/modules/sdk/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [dependencies] sdk-proc = { path = "sdk_proc" } -futures-util = "0.3" +futures-util = "0.3.31" difluoroborane = { path = "../.." } diff --git a/modules/sdk/sdk_proc/Cargo.toml b/modules/sdk/sdk_proc/Cargo.toml index 0b5bf28..6817865 100644 --- a/modules/sdk/sdk_proc/Cargo.toml +++ b/modules/sdk/sdk_proc/Cargo.toml @@ -14,9 +14,9 @@ name = "tests" path = "tests/progress.rs" [dev-dependencies] -trybuild = "1.0" +trybuild = "1.0.103" [dependencies] -proc-macro2 = "1.0" -syn = "1.0" -quote = "1.0" +proc-macro2 = "1.0.93" +syn = "2.0.98" +quote = "1.0.38" diff --git a/runtime/console/Cargo.toml b/runtime/console/Cargo.toml index 82c629a..600d68b 100644 --- a/runtime/console/Cargo.toml +++ b/runtime/console/Cargo.toml @@ -6,25 +6,25 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -console-api = "0.3" -prost-types = "0.10" +console-api = "0.3.0" +prost-types = "0.10.1" tonic = { version = "0.7.2", default_features = false, features = [] } -hyper = { version = "0.14", default_features = false, features = ["http2", "server", "stream"] } -thread_local = "1.1" -tracing = "0.1" -tracing-core = "0.1" -tracing-subscriber = { version = "0.3", default_features = false, features = ["registry"] } -crossbeam-utils = "0.8" -crossbeam-channel = "0.5" -async-net = "1.6" -async-compat = "0.2" -async-channel = "1.6" -async-oneshot = "0.5" -async-io = "1.7" -tokio-util = "0.7" -futures-util = "0.3" -tokio = { version = "1.19", default_features = false, features = []} -hdrhistogram = "7.5" +hyper = { version = "0.14.32", default_features = false, features = ["http2", "server", "stream"] } +thread_local = "1.1.8" +tracing = "0.1.41" +tracing-core = "0.1.33" +tracing-subscriber = { version = "0.3.19", default_features = false, features = ["registry"] } +crossbeam-utils = "0.8.21" +crossbeam-channel = "0.5.14" +async-net = "2.0.0" +async-compat = "0.2.4" +async-channel = "1.9.0" +async-oneshot = "0.5.9" +async-io = "2.4.0" +tokio-util = "0.7.13" +futures-util = "0.3.31" +tokio = { version = "1.43.0", default_features = false, features = []} +hdrhistogram = "7.5.4" [dev-dependencies] -tracing-subscriber = "0.3" +tracing-subscriber = "0.3.19" diff --git a/runtime/executor/Cargo.toml b/runtime/executor/Cargo.toml index b11121f..1aad628 100644 --- a/runtime/executor/Cargo.toml +++ b/runtime/executor/Cargo.toml @@ -31,34 +31,34 @@ path = "benches/stats.rs" [dependencies] lightproc = { path = "../lightproc" } -crossbeam-utils = "0.8" -crossbeam-channel = "0.5" -crossbeam-epoch = "0.9" -crossbeam-deque = "0.8.1" -lazy_static = "1.4" -libc = "0.2" -num_cpus = "1.13" +crossbeam-utils = "0.8.21" +crossbeam-channel = "0.5.14" +crossbeam-epoch = "0.9.18" +crossbeam-deque = "0.8.6" +lazy_static = "1.5.0" +libc = "0.2.169" +num_cpus = "1.16.0" pin-utils = "0.1.0" -parking_lot = "0.12" +parking_lot = "0.12.3" # Allocator -arrayvec = { version = "0.7.0" } -futures-timer = "3.0.2" -once_cell = "1.4.0" -crossbeam-queue = "0.3.0" -hdrhistogram = "7.5" +arrayvec = { version = "0.7.6" } +futures-timer = "3.0.3" +once_cell = "1.20.3" +crossbeam-queue = "0.3.12" +hdrhistogram = "7.5.4" # Stats & Tracing -tracing = "0.1" +tracing = "0.1.41" # Supervision trees -sharded-slab = "0.1" -thread_local = "1.1" +sharded-slab = "0.1.7" +thread_local = "1.1.8" [dev-dependencies] async-std = "1.10.0" -tracing = { version = "0.1.19", features = ["max_level_trace"]} -tracing-subscriber = "0.3.1" -futures-util = "0.3" -rand = "0.8" -criterion = "0.3" \ No newline at end of file +tracing = { version = "0.1.41", features = ["max_level_trace"]} +tracing-subscriber = "0.3.19" +futures-util = "0.3.31" +rand = "0.9.0" +criterion = "0.5.1" diff --git a/runtime/lightproc/Cargo.toml b/runtime/lightproc/Cargo.toml index 7d4be3e..5c3ee08 100644 --- a/runtime/lightproc/Cargo.toml +++ b/runtime/lightproc/Cargo.toml @@ -11,14 +11,14 @@ license = "Apache-2.0/MIT" edition = "2021" [dependencies] -crossbeam-utils = "0.8" +crossbeam-utils = "0.8.21" pin-utils = "0.1.0" -bitfield = "0.13.2" +bitfield = "0.18.1" bitflags = "1.3.2" -tracing = "0.1" +tracing = "0.1.41" [dev-dependencies] -crossbeam = "0.8" -futures-executor = "0.3" -lazy_static = "1.4.0" -async-std = "1.5" \ No newline at end of file +crossbeam = "0.8.4" +futures-executor = "0.3.31" +lazy_static = "1.5.0" +async-std = "1.13.0" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 99c6e11..9db33c0 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.66" +channel = "1.84"