From 1221cfdf981e8edaa3c9aa40e5880a3de0e9fc5e Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Tue, 23 Jan 2024 09:26:23 +0200 Subject: [PATCH] chore: Bump various dependencies to what FF ships with (#1556) * chore: Bump various dependencies to what FF ships with * Allow patch-level variations in deps * Update neqo-common/Cargo.toml Co-authored-by: Martin Thomson * Update neqo-crypto/Cargo.toml Co-authored-by: Martin Thomson * Update neqo-http3/Cargo.toml Co-authored-by: Martin Thomson * Update neqo-client/Cargo.toml Co-authored-by: Max Inden * Update neqo-http3/Cargo.toml Co-authored-by: Martin Thomson * Update test-fixture/Cargo.toml Co-authored-by: Martin Thomson * Update neqo-interop/Cargo.toml Co-authored-by: Martin Thomson * Update neqo-transport/Cargo.toml Co-authored-by: Martin Thomson * Update neqo-transport/Cargo.toml Co-authored-by: Martin Thomson * Update neqo-server/Cargo.toml Co-authored-by: Martin Thomson * Update neqo-server/Cargo.toml Co-authored-by: Martin Thomson --------- Co-authored-by: Martin Thomson Co-authored-by: Max Inden --- neqo-client/Cargo.toml | 10 +++++----- neqo-common/Cargo.toml | 8 ++++---- neqo-crypto/Cargo.toml | 10 +++++----- neqo-http3/Cargo.toml | 14 +++++++------- neqo-interop/Cargo.toml | 9 ++++----- neqo-qpack/Cargo.toml | 8 ++++---- neqo-server/Cargo.toml | 14 +++++++------- neqo-transport/Cargo.toml | 10 +++++----- test-fixture/Cargo.toml | 4 ++-- 9 files changed, 43 insertions(+), 44 deletions(-) diff --git a/neqo-client/Cargo.toml b/neqo-client/Cargo.toml index 43ff45d9e5..ca11186f95 100644 --- a/neqo-client/Cargo.toml +++ b/neqo-client/Cargo.toml @@ -9,15 +9,15 @@ rust-version = "1.70.0" license = "MIT OR Apache-2.0" [dependencies] -neqo-crypto = { path = "./../neqo-crypto" } -neqo-transport = { path = "./../neqo-transport" } +mio = "~0.6.23" neqo-common = { path="./../neqo-common" } +neqo-crypto = { path = "./../neqo-crypto" } neqo-http3 = { path = "./../neqo-http3" } neqo-qpack = { path = "./../neqo-qpack" } -structopt = "0.3.7" -url = "2.0" +neqo-transport = { path = "./../neqo-transport" } qlog = "0.11.0" -mio = "0.6.17" +structopt = "0.3" +url = "~2.5.0" [features] deny-warnings = [] diff --git a/neqo-common/Cargo.toml b/neqo-common/Cargo.toml index 584f3100d4..f6fd952a18 100644 --- a/neqo-common/Cargo.toml +++ b/neqo-common/Cargo.toml @@ -8,12 +8,12 @@ license = "MIT OR Apache-2.0" build = "build.rs" [dependencies] -log = { version = "0.4.0", default-features = false } -enum-map = "~2.7.3" +enum-map = "2.7" env_logger = { version = "0.10", default-features = false } -lazy_static = "1.3.0" +lazy_static = "1.4" +log = { version = "0.4", default-features = false } qlog = "0.11.0" -time = { version = "0.3", features = ["formatting"] } +time = {version = "0.3.23", features = ["formatting"]} [dev-dependencies] test-fixture = { path = "../test-fixture" } diff --git a/neqo-crypto/Cargo.toml b/neqo-crypto/Cargo.toml index 79d6dc21d9..c7cad21c87 100644 --- a/neqo-crypto/Cargo.toml +++ b/neqo-crypto/Cargo.toml @@ -8,15 +8,15 @@ build = "build.rs" license = "MIT OR Apache-2.0" [dependencies] +log = {version = "~0.4.17", default-features = false} neqo-common = { path = "../neqo-common" } -log = {version = "0.4.0", default-features = false} [build-dependencies] -bindgen = {version = "0.69", default-features = false, features= ["runtime"]} -serde = "1.0" -serde_derive = "1.0" -toml = "0.5" +bindgen = {version = "0.69.1", default-features = false, features= ["runtime"]} mozbuild = {version = "0.1", optional = true} +serde = "1.0.195" +serde_derive = "1.0.195" +toml = "0.5.11" [dev-dependencies] test-fixture = { path = "../test-fixture" } diff --git a/neqo-http3/Cargo.toml b/neqo-http3/Cargo.toml index bea90f159c..8dafbe8b40 100644 --- a/neqo-http3/Cargo.toml +++ b/neqo-http3/Cargo.toml @@ -7,17 +7,17 @@ rust-version = "1.70.0" license = "MIT OR Apache-2.0" [dependencies] +enumset = "1.1.2" +lazy_static = "1.4" +log = {version = "0.4.17", default-features = false} neqo-common = { path = "./../neqo-common" } neqo-crypto = { path = "./../neqo-crypto" } -neqo-transport = { path = "./../neqo-transport" } neqo-qpack = { path = "./../neqo-qpack" } -log = {version = "0.4.0", default-features = false} -smallvec = "1.0.0" +neqo-transport = { path = "./../neqo-transport" } qlog = "0.11.0" -sfv = "0.9.1" -url = "2.0" -lazy_static = "1.3.0" -enumset = "1.1.2" +sfv = "0.9.3" +smallvec = "1.11.1" +url = "2.5" [dev-dependencies] test-fixture = { path = "../test-fixture" } diff --git a/neqo-interop/Cargo.toml b/neqo-interop/Cargo.toml index 7660b0f1d0..a197aa2203 100644 --- a/neqo-interop/Cargo.toml +++ b/neqo-interop/Cargo.toml @@ -7,14 +7,13 @@ rust-version = "1.70.0" license = "MIT OR Apache-2.0" [dependencies] -neqo-crypto = { path = "./../neqo-crypto" } -neqo-transport = { path = "./../neqo-transport" } +lazy_static = "1.4" neqo-common = { path="./../neqo-common" } +neqo-crypto = { path = "./../neqo-crypto" } neqo-http3 = { path = "./../neqo-http3" } neqo-qpack = { path = "./../neqo-qpack" } - -structopt = "0.3.7" -lazy_static = "1.3.0" +neqo-transport = { path = "./../neqo-transport" } +structopt = "~0.3" [features] deny-warnings = [] diff --git a/neqo-qpack/Cargo.toml b/neqo-qpack/Cargo.toml index 0cc6cb8c2e..c07a7fcec0 100644 --- a/neqo-qpack/Cargo.toml +++ b/neqo-qpack/Cargo.toml @@ -7,13 +7,13 @@ rust-version = "1.70.0" license = "MIT OR Apache-2.0" [dependencies] +lazy_static = "~1.4.0" +log = {version = "~0.4.17", default-features = false} neqo-common = { path = "./../neqo-common" } -neqo-transport = { path = "./../neqo-transport" } neqo-crypto = { path = "./../neqo-crypto" } -log = {version = "0.4.0", default-features = false} -static_assertions = "1.1.0" +neqo-transport = { path = "./../neqo-transport" } qlog = "0.11.0" -lazy_static = "1.3.0" +static_assertions = "~1.1.0" [dev-dependencies] test-fixture = { path = "../test-fixture" } diff --git a/neqo-server/Cargo.toml b/neqo-server/Cargo.toml index 09ac930d50..888df43163 100644 --- a/neqo-server/Cargo.toml +++ b/neqo-server/Cargo.toml @@ -7,17 +7,17 @@ rust-version = "1.70.0" license = "MIT OR Apache-2.0" [dependencies] -neqo-crypto = { path = "./../neqo-crypto" } -neqo-transport = { path = "./../neqo-transport" } +log = {version = "0.4.17", default-features = false} +mio = "0.6.23" +mio-extras = "2.0.6" neqo-common = { path="./../neqo-common" } +neqo-crypto = { path = "./../neqo-crypto" } neqo-http3 = { path = "./../neqo-http3" } neqo-qpack = { path = "./../neqo-qpack" } -structopt = "0.3.7" -regex = "1" -mio = "0.6.17" -mio-extras = "2.0.5" -log = {version = "0.4.0", default-features = false} +neqo-transport = { path = "./../neqo-transport" } qlog = "0.11.0" +regex = "1.9" +structopt = "0.3" [features] deny-warnings = [] diff --git a/neqo-transport/Cargo.toml b/neqo-transport/Cargo.toml index a4da735a8a..3263991be9 100644 --- a/neqo-transport/Cargo.toml +++ b/neqo-transport/Cargo.toml @@ -7,13 +7,13 @@ rust-version = "1.70.0" license = "MIT OR Apache-2.0" [dependencies] -neqo-crypto = { path = "../neqo-crypto" } +indexmap = "1.9.3" +lazy_static = "1.4" +log = {version = "0.4.17", default-features = false} neqo-common = { path = "../neqo-common" } -lazy_static = "1.3.0" -log = {version = "0.4.0", default-features = false} -smallvec = "1.0.0" +neqo-crypto = { path = "../neqo-crypto" } qlog = "0.11.0" -indexmap = "1.0" +smallvec = "1.11.1" [dev-dependencies] test-fixture = { path = "../test-fixture" } diff --git a/test-fixture/Cargo.toml b/test-fixture/Cargo.toml index dddabfbc2d..f142c9a2f4 100644 --- a/test-fixture/Cargo.toml +++ b/test-fixture/Cargo.toml @@ -7,8 +7,8 @@ rust-version = "1.70.0" license = "MIT OR Apache-2.0" [dependencies] -lazy_static = "1.3.0" -log = {version = "0.4.0", default-features = false} +lazy_static = "1.4" +log = {version = "0.4.17", default-features = false} neqo-common = { path = "../neqo-common" } neqo-crypto = { path = "../neqo-crypto" } neqo-http3 = { path = "../neqo-http3" }