From e3f81b4603cfe860f00a0149a58d17a896920a7d Mon Sep 17 00:00:00 2001 From: Dimitris Apostolou Date: Mon, 24 Feb 2025 21:02:02 +0200 Subject: [PATCH] deps: avoid duplicate crates --- Cargo.toml | 48 ++++++++++++++++++++++++++++++++++++++++++ bin/Cargo.toml | 32 ++++++++++++++-------------- command/Cargo.toml | 44 +++++++++++++++++++-------------------- e2e/Cargo.toml | 18 ++++++++-------- lib/Cargo.toml | 52 +++++++++++++++++++++++----------------------- 5 files changed, 121 insertions(+), 73 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2a85faa66..2ba5bb57a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,54 @@ members = ["lib", "command", "bin", "e2e"] resolver = "2" # consistent with rust edition 2021, see https://doc.rust-lang.org/cargo/reference/resolver.html#features +[workspace.dependencies] +anyhow = "1.0.89" +clap = "4.5.20" +cookie-factory = "0.3.3" +futures = "0.3.31" +hdrhistogram = "7.5.4" +hex = "0.4.3" +hpack = "0.3.0" +hyper = "0.14.28" +hyper-rustls = { version = "0.24.2", default-features = false } +idna = "1.0.2" +jemallocator = "0.5.4" +kawa = { version = "0.6.7", default-features = false } +libc = "0.2.159" +log = "0.4.22" +memchr = "2.7.4" +mio = "1.0.2" +nix = "0.29.0" +nom = "7.1.3" +paw = "1.0.0" +pool = "0.1.4" +poule = "0.3.2" +prettytable-rs = { version = "0.10.0", default-features = false } +prost = "0.13.3" +prost-build = "0.13.3" +quickcheck = "1.0.3" +rand = "0.8.5" +regex = "1.11.0" +rustls-pemfile = "2.2.0" +rusty_ulid = "2.0.0" +serde = "1.0.210" +serde_json = "1.0.128" +serial_test = "3.1.1" +sha2 = "0.10.8" +slab = "0.4.9" +socket2 = "0.5.7" +sozu-command-lib = { version = "1.0.6", path = "command" } +sozu-lib = { version = "1.0.6", path = "lib" } +tempfile = "3.13.0" +termion = "4.0.3" +thiserror = "2.0.3" +time = "0.3.36" +tiny_http = "0.12.0" +tokio = "1.40.0" +toml = "0.8.19" +trailer = "0.1.2" +x509-parser = "0.16.0" + [profile.release] lto = true codegen-units = 1 diff --git a/bin/Cargo.toml b/bin/Cargo.toml index e2591f57a..15844b3b3 100644 --- a/bin/Cargo.toml +++ b/bin/Cargo.toml @@ -27,23 +27,23 @@ name = "sozu" path = "src/main.rs" [dependencies] -clap = { version = "^4.5.20", features = ["derive"] } -jemallocator = { version = "^0.5.4", optional = true } -libc = "^0.2.159" -log = "^0.4.22" -mio = { version = "^1.0.2", features = ["os-poll", "net"] } -nix = { version = "^0.29.0", features = ["signal", "fs"] } -nom = "^7.1.3" -paw = "^1.0.0" -serde = { version = "^1.0.210", features = ["derive"] } -serde_json = "^1.0.128" -prost = "^0.13.3" -tempfile = "^3.13.0" -termion = "^4.0.3" -thiserror = "^2.0.3" +clap = { workspace = true, features = ["derive"] } +jemallocator = { workspace = true, optional = true } +libc = { workspace = true } +log = { workspace = true } +mio = { workspace = true, features = ["os-poll", "net"] } +nix = { workspace = true, features = ["signal", "fs"] } +nom = { workspace = true } +paw = { workspace = true } +serde = { workspace = true, features = ["derive"] } +serde_json = { workspace = true } +prost = { workspace = true } +tempfile = { workspace = true } +termion = { workspace = true } +thiserror = { workspace = true } -sozu-command-lib = { path = "../command", version = "^1.0.6" } -sozu-lib = { path = "../lib", version = "^1.0.6" } +sozu-command-lib = { workspace = true } +sozu-lib = { workspace = true } [target.'cfg(target_os="linux")'.dependencies] num_cpus = "^1.16.0" diff --git a/command/Cargo.toml b/command/Cargo.toml index 564c9db5c..e1b9d08a6 100644 --- a/command/Cargo.toml +++ b/command/Cargo.toml @@ -27,27 +27,27 @@ include = [ ] [dependencies] -hex = "^0.4.3" -libc = "^0.2.159" -log = "^0.4.22" -time = "^0.3.36" -toml = "^0.8.19" -memchr = "^2.7.4" -mio = { version = "^1.0.2", features = ["os-poll", "net"] } -nix = { version = "^0.29.0", features = ["socket", "uio"] } -nom = "^7.1.3" -prost = "^0.13.3" -rand = "^0.8.5" -rusty_ulid = "^2.0.0" -serde = { version = "^1.0.210", features = ["derive"] } -serde_json = "^1.0.128" -sha2 = "^0.10.8" -trailer = "^0.1.2" -prettytable-rs = { version = "^0.10.0", default-features = false } -pool = "^0.1.4" -poule = "^0.3.2" -thiserror = "^2.0.3" -x509-parser = "^0.16.0" +hex = { workspace = true } +libc = { workspace = true } +log = { workspace = true } +time = { workspace = true } +toml = { workspace = true } +memchr = { workspace = true } +mio = { workspace = true, features = ["os-poll", "net"] } +nix = { workspace = true, features = ["socket", "uio"] } +nom = { workspace = true } +prost = { workspace = true } +rand = { workspace = true } +rusty_ulid = { workspace = true } +serde = { workspace = true, features = ["derive"] } +serde_json = { workspace = true } +sha2 = { workspace = true } +trailer = { workspace = true } +prettytable-rs = { workspace = true } +pool = { workspace = true } +poule = { workspace = true } +thiserror = { workspace = true } +x509-parser = { workspace = true } [features] unstable = [] @@ -58,4 +58,4 @@ logs-trace = [] travis-ci = { repository = "sozu-proxy/sozu" } [build-dependencies] -prost-build = { version = "^0.13.3" } +prost-build = { workspace = true } diff --git a/e2e/Cargo.toml b/e2e/Cargo.toml index 7e80309b4..69f109215 100644 --- a/e2e/Cargo.toml +++ b/e2e/Cargo.toml @@ -5,14 +5,14 @@ rust-version = "1.80.0" edition = "2021" [dependencies] -futures = "^0.3.31" -hyper = { version = "^0.14.28", features = ["client", "http1"] } -hyper-rustls = { version = "^0.24.2", default-features = false, features = ["webpki-tokio", "http1", "tls12", "logging"] } -libc = "^0.2.159" -mio = "^1.0.2" +futures = { workspace = true } +hyper = { workspace = true, features = ["client", "http1"] } +hyper-rustls = { workspace = true, features = ["webpki-tokio", "http1", "tls12", "logging"] } +libc = { workspace = true } +mio = { workspace = true } rustls = { version = "^0.21.10", features = ["dangerous_configuration"] } -time = "^0.3.36" -tokio = { version = "1.40.0", features = ["net", "rt-multi-thread"] } +time = { workspace = true } +tokio = { workspace = true, features = ["net", "rt-multi-thread"] } -sozu-command-lib = { path = "../command", version = "^1.0.6" } -sozu-lib = { path = "../lib", version = "^1.0.6" } +sozu-command-lib = { workspace = true } +sozu-lib = { workspace = true } diff --git a/lib/Cargo.toml b/lib/Cargo.toml index d41b20c32..74e0cb931 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -28,41 +28,41 @@ include = [ ] [dependencies] -anyhow = "^1.0.89" -cookie-factory = "^0.3.3" -hdrhistogram = "^7.5.4" -hex = "^0.4.3" -hpack = "^0.3.0" -idna = "^1.0.2" -kawa = { version = "^0.6.7", default-features = false } -libc = "^0.2.159" -memchr = "^2.7.4" -mio = { version = "^1.0.2", features = ["os-poll", "os-ext", "net"] } -nom = { version = "^7.1.3", default-features = true, features = ["std"] } -poule = "^0.3.2" -rand = "^0.8.5" -regex = "^1.11.0" +anyhow = { workspace = true } +cookie-factory = { workspace = true } +hdrhistogram = { workspace = true } +hex = { workspace = true } +hpack = { workspace = true } +idna = { workspace = true } +kawa = { workspace = true } +libc = { workspace = true } +memchr = { workspace = true } +mio = { workspace = true, features = ["os-poll", "os-ext", "net"] } +nom = { workspace = true, features = ["std"] } +poule = { workspace = true } +rand = { workspace = true } +regex = { workspace = true } rustls = { version = "^0.23.14", default-features = false, features = [ "ring", "logging", "std", "tls12", ] } -rustls-pemfile = "^2.2.0" -rusty_ulid = "^2.0.0" -sha2 = "^0.10.8" -slab = "^0.4.9" -socket2 = { version = "^0.5.7", features = ["all"] } -thiserror = "^2.0.3" -time = "^0.3.36" +rustls-pemfile = { workspace = true } +rusty_ulid = { workspace = true } +sha2 = { workspace = true } +slab = { workspace = true } +socket2 = { workspace = true, features = ["all"] } +thiserror = { workspace = true } +time = { workspace = true } -sozu-command-lib = { path = "../command", version = "^1.0.6" } +sozu-command-lib = { workspace = true } [dev-dependencies] -quickcheck = "^1.0.3" -rand = "^0.8.5" -serial_test = "^3.1.1" -tiny_http = "^0.12.0" +quickcheck = { workspace = true } +rand = { workspace = true } +serial_test = { workspace = true } +tiny_http = { workspace = true } [features] default = ["simd"]