From 3f489e2eab014ddd04de58e570ba56e9b027f0bc Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Sun, 14 Jul 2024 11:56:38 +0200
Subject: [PATCH] Use workspace dependencies for all external dependencies

---
 Cargo.toml             | 33 +++++++++++++++++++++++++++++++++
 bench/Cargo.toml       | 14 +++++++-------
 perf/Cargo.toml        | 22 +++++++++++-----------
 quinn-proto/Cargo.toml | 26 +++++++++++++-------------
 quinn-udp/Cargo.toml   |  4 ++--
 quinn/Cargo.toml       | 42 +++++++++++++++++++++---------------------
 6 files changed, 87 insertions(+), 54 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 9fc2e059e..9413c5943 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,9 +4,42 @@ default-members = ["quinn", "quinn-proto", "quinn-udp", "bench", "perf"]
 resolver = "2"
 
 [workspace.dependencies]
+anyhow = "1.0.22"
+arbitrary = { version = "1.0.1", features = ["derive"] }
+async-io = "2"
+async-std = "1.11"
+assert_matches = "1.1"
+bencher = "0.1.5"
+bytes = "1"
+clap = { version = "4", features = ["derive"] }
+crc = "3"
+directories-next = "2"
+futures-io = "0.3.19"
+hdrhistogram = { version = "7.2", default-features = false }
+hex-literal = "0.4"
+lazy_static = "1"
+once_cell = "1.19"
+pin-project-lite = "0.2"
+rand = "0.8"
+rcgen = "0.13"
+ring = "0.17"
+rustc-hash = "2"
+rustls = { version = "0.23.5", default-features = false, features = ["ring", "std"] }
+rustls-pemfile = "2"
+rustls-platform-verifier = "0.3"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1"
+slab = "0.4"
+smol = "2"
 socket2 = "0.5"
+thiserror = "1.0.21"
+tinyvec = { version = "1.1", features = ["alloc"] }
+tokio = { version = "1.28.1", features = ["sync"] }
 tracing = { version = "0.1.10", default-features = false, features = ["std"] }
+tracing-futures = { version = "0.2.0", default-features = false, features = ["std-future"] }
 tracing-subscriber = { version = "0.3.0", default-features = false, features = ["env-filter", "fmt", "ansi", "time", "local-time"] }
+url = "2"
+windows-sys = { version = "0.52", features = ["Win32_Foundation", "Win32_System_IO", "Win32_Networking_WinSock"] }
 
 [profile.bench]
 debug = true
diff --git a/bench/Cargo.toml b/bench/Cargo.toml
index e3616eb7e..efbe8ba49 100644
--- a/bench/Cargo.toml
+++ b/bench/Cargo.toml
@@ -6,13 +6,13 @@ license = "MIT OR Apache-2.0"
 publish = false
 
 [dependencies]
-anyhow = "1.0.22"
-bytes = "1"
-hdrhistogram = { version = "7.2", default-features = false }
+anyhow = { workspace = true }
+bytes = { workspace = true }
+clap = { workspace = true }
+hdrhistogram = { workspace = true }
 quinn = { path = "../quinn", features = ["ring"] }
-rcgen = "0.13"
-rustls = { version = "0.23", default-features = false, features = ["ring", "std"] }
-clap = { version = "4", features = ["derive"] }
-tokio = { version = "1.0.1", features = ["rt", "sync"] }
+rcgen = { workspace = true }
+rustls = { workspace = true }
+tokio = { workspace = true, features = ["rt"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
diff --git a/perf/Cargo.toml b/perf/Cargo.toml
index a603ef8a4..f330b5c39 100644
--- a/perf/Cargo.toml
+++ b/perf/Cargo.toml
@@ -11,18 +11,18 @@ default = ["json-output"]
 json-output = ["serde", "serde_json"]
 
 [dependencies]
-anyhow = "1.0.22"
-hdrhistogram = { version = "7.2", default-features = false }
+anyhow = { workspace = true }
+bytes = { workspace = true }
+clap = { workspace = true }
+hdrhistogram = { workspace = true }
 quinn = { path = "../quinn" }
 quinn-proto = { path = "../quinn-proto" }
-rcgen = "0.13"
-rustls = { version = "0.23", default-features = false, features = ["ring", "std"] }
-rustls-pemfile = "2"
-serde = { version = "1.0", features = ["derive"], optional = true  }
-serde_json = { version = "1.0", optional = true }
-socket2 = "0.5"
-clap = { version = "4", features = ["derive"] }
-tokio = { version = "1.0.1", features = ["rt", "macros", "signal", "net", "sync"] }
+rcgen = { workspace = true }
+rustls = { workspace = true }
+rustls-pemfile = { workspace = true }
+serde = { workspace = true, optional = true  }
+serde_json = { workspace = true, optional = true }
+socket2 = { workspace = true }
+tokio = { workspace = true, features = ["rt", "macros", "signal", "net"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
-bytes = "1"
diff --git a/quinn-proto/Cargo.toml b/quinn-proto/Cargo.toml
index 549e0c79d..5b790b0d2 100644
--- a/quinn-proto/Cargo.toml
+++ b/quinn-proto/Cargo.toml
@@ -24,21 +24,21 @@ platform-verifier = ["dep:rustls-platform-verifier"]
 log = ["tracing/log"]
 
 [dependencies]
-arbitrary = { version = "1.0.1", features = ["derive"], optional = true }
-bytes = "1"
-rustc-hash = "2"
-rand = "0.8"
-ring = { version = "0.17", optional = true }
-rustls = { version = "0.23.5", default-features = false, features = ["ring", "std"], optional = true }
-rustls-platform-verifier = { version = "0.3", optional = true }
-slab = "0.4"
-thiserror = "1.0.21"
-tinyvec = { version = "1.1", features = ["alloc"] }
+arbitrary = { workspace = true, optional = true }
+bytes = { workspace = true }
+rustc-hash = { workspace = true }
+rand = { workspace = true }
+ring = { workspace = true, optional = true }
+rustls = { workspace = true, optional = true }
+rustls-platform-verifier = { workspace = true, optional = true }
+slab = { workspace = true }
+thiserror = { workspace= true }
+tinyvec = { workspace = true, features = ["alloc"] }
 tracing = { workspace = true }
 
 [dev-dependencies]
-assert_matches = "1.1"
-hex-literal = "0.4.0"
-rcgen = "0.13"
+assert_matches = { workspace = true }
+hex-literal = { workspace = true  }
+rcgen = { workspace = true }
 tracing-subscriber = { workspace = true }
 lazy_static = "1"
diff --git a/quinn-udp/Cargo.toml b/quinn-udp/Cargo.toml
index c2ed79be2..293080297 100644
--- a/quinn-udp/Cargo.toml
+++ b/quinn-udp/Cargo.toml
@@ -24,8 +24,8 @@ socket2 = { workspace = true }
 tracing = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]
-windows-sys = { version = "0.52.0", features = ["Win32_Foundation", "Win32_System_IO", "Win32_Networking_WinSock"] }
-once_cell = "1.19.0"
+once_cell = { workspace = true }
+windows-sys = { workspace = true }
 
 [dev-dependencies]
 criterion = "0.5"
diff --git a/quinn/Cargo.toml b/quinn/Cargo.toml
index e768360b8..db421b434 100644
--- a/quinn/Cargo.toml
+++ b/quinn/Cargo.toml
@@ -31,35 +31,35 @@ runtime-smol = ["async-io", "smol"]
 log = ["tracing/log", "proto/log", "udp/log"]
 
 [dependencies]
-async-io = { version = "2.0", optional = true }
-async-std = { version = "1.11", optional = true }
-bytes = "1"
+async-io = { workspace = true, optional = true }
+async-std = { workspace = true, optional = true }
+bytes = { workspace = true }
 # Enables futures::io::{AsyncRead, AsyncWrite} support for streams
-futures-io = { version = "0.3.19", optional = true }
-rustc-hash = "2"
-pin-project-lite = "0.2"
+futures-io = { workspace = true, optional = true }
+rustc-hash = { workspace = true }
+pin-project-lite = { workspace = true }
 proto = { package = "quinn-proto", path = "../quinn-proto", version = "0.11.2", default-features = false }
-rustls = { version = "0.23", default-features = false, features = ["ring", "std"], optional = true }
-smol = { version = "2", optional = true }
+rustls = { workspace = true, optional = true }
+smol = { workspace = true, optional = true }
 socket2 = { workspace = true }
-thiserror = "1.0.21"
+thiserror = { workspace = true }
 tracing =  { workspace = true }
-tokio = { version = "1.28.1", features = ["sync"] }
+tokio = { workspace = true }
 udp = { package = "quinn-udp", path = "../quinn-udp", version = "0.5", default-features = false }
 
 [dev-dependencies]
-anyhow = "1.0.22"
-crc = "3"
-bencher = "0.1.5"
-directories-next = "2"
-rand = "0.8"
-rcgen = "0.13"
-rustls-pemfile = "2"
-clap = { version = "4", features = ["derive"] }
-tokio = { version = "1.28.1", features = ["rt", "rt-multi-thread", "time", "macros", "sync"] }
+anyhow = { workspace = true }
+crc = { workspace = true }
+bencher = { workspace = true }
+directories-next = { workspace = true }
+rand = { workspace = true }
+rcgen = { workspace = true }
+rustls-pemfile = { workspace = true }
+clap = { workspace = true }
+tokio = { workspace = true, features = ["rt", "rt-multi-thread", "time", "macros"] }
 tracing-subscriber = { workspace = true }
-tracing-futures = { version = "0.2.0", default-features = false, features = ["std-future"] }
-url = "2"
+tracing-futures = { workspace = true }
+url = { workspace = true }
 
 [[example]]
 name = "server"