From ff630a1765874d143d7e0452799c71cd54c399cf Mon Sep 17 00:00:00 2001 From: Max Inden Date: Tue, 23 Jul 2024 12:26:57 +0200 Subject: [PATCH 1/3] deps(quinn-udp): move to workspace dependency --- Cargo.toml | 1 + neqo-bin/Cargo.toml | 2 +- neqo-udp/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f83d7eb8c5..86ea97812e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,6 +32,7 @@ rust-version = "1.76.0" [workspace.dependencies] log = { version = "0.4", default-features = false } qlog = { version = "0.13", default-features = false } +quinn-udp = { version = "0.5.0", default-features = false } [workspace.lints.clippy] cargo = { level = "warn", priority = -1 } diff --git a/neqo-bin/Cargo.toml b/neqo-bin/Cargo.toml index 43ee5b79af..d8f33a6ce0 100644 --- a/neqo-bin/Cargo.toml +++ b/neqo-bin/Cargo.toml @@ -38,7 +38,7 @@ neqo-http3 = { path = "./../neqo-http3" } neqo-transport = { path = "./../neqo-transport" } neqo-udp = { path = "./../neqo-udp" } qlog = { workspace = true } -quinn-udp = { version = "0.5.0", default-features = false } +quinn-udp = { workspace = true } regex = { version = "1.9", default-features = false, features = ["unicode-perl"] } tokio = { version = "1", default-features = false, features = ["net", "time", "macros", "rt", "rt-multi-thread"] } url = { version = "2.5", default-features = false } diff --git a/neqo-udp/Cargo.toml b/neqo-udp/Cargo.toml index 456ecd3356..3a672b84fe 100644 --- a/neqo-udp/Cargo.toml +++ b/neqo-udp/Cargo.toml @@ -18,7 +18,7 @@ workspace = true [dependencies] log = { workspace = true } neqo-common = { path = "./../neqo-common" } -quinn-udp = { version = "0.5.0", default-features = false } +quinn-udp = { workspace = true } [package.metadata.cargo-machete] ignored = ["log"] From 4b20fead3cc42727752b6bbd50509ab6aea87354 Mon Sep 17 00:00:00 2001 From: Max Inden Date: Tue, 23 Jul 2024 12:27:36 +0200 Subject: [PATCH 2/3] deps(quinn-udp): bump to latest version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 86ea97812e..f82e09ba69 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ rust-version = "1.76.0" [workspace.dependencies] log = { version = "0.4", default-features = false } qlog = { version = "0.13", default-features = false } -quinn-udp = { version = "0.5.0", default-features = false } +quinn-udp = { version = "0.5.4", default-features = false } [workspace.lints.clippy] cargo = { level = "warn", priority = -1 } From 0b2450551abd51e32afdeea8457589895343782d Mon Sep 17 00:00:00 2001 From: Max Inden Date: Tue, 23 Jul 2024 12:28:17 +0200 Subject: [PATCH 3/3] deps(quinn-udp): enable direct-log feature https://github.com/quinn-rs/quinn/pull/1923 made the `tracing` dependency optional. In addition, when `direct-log` is enabled, it allows using `log` instead of `tracing` for logging. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index f82e09ba69..3bc14976b2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ rust-version = "1.76.0" [workspace.dependencies] log = { version = "0.4", default-features = false } qlog = { version = "0.13", default-features = false } -quinn-udp = { version = "0.5.4", default-features = false } +quinn-udp = { version = "0.5.4", default-features = false, features = ["direct-log"] } [workspace.lints.clippy] cargo = { level = "warn", priority = -1 }