cargo: Omit patch versions from Cargo.toml files

There's no need for us to specify patch versions in Cargo.toml files, since we commit our Cargo.lock file. These versions mean that dependency changes touch unnecessary files, requiring "shotgun surgery" for routine dependency bumps (and also triggering CI workflows for these subcrates). Let's omit patch versions from Cargo.toml Signed-off-by: Oliver Gould <ver@buoyant.io>
linkerd · Feb 17, 2022 · b1237ac · b1237ac
1 parent c876fe1
commit b1237ac
Show file tree

Hide file tree

Showing 39 changed files with 73 additions and 75 deletions.
diff --git a/linkerd/addr/fuzz/Cargo.toml b/linkerd/addr/fuzz/Cargo.toml
@@ -12,7 +12,7 @@ cargo-fuzz = true
 libfuzzer-sys = "0.4"
 linkerd-addr = { path = ".." }
 linkerd-tracing = { path = "../../tracing", features = ["ansi"] }
-tracing = "0.1.29"
+tracing = "0.1"
 
 # Prevent this from interfering with workspaces
 [workspace]

diff --git a/linkerd/app/Cargo.toml b/linkerd/app/Cargo.toml
@@ -23,10 +23,10 @@ linkerd-app-inbound = { path = "./inbound" }
 linkerd-app-outbound = { path = "./outbound" }
 linkerd-error = { path = "../error" }
 linkerd-opencensus = { path = "../opencensus" }
-regex = "1.5.4"
+regex = "1.5"
 thiserror = "1.0"
 tokio = { version = "1", features = ["rt"] }
-tokio-stream = { version = "0.1.8", features = ["time", "sync"] }
+tokio-stream = { version = "0.1", features = ["time", "sync"] }
 tonic = { version = "0.6", default-features = false, features = ["prost"] }
 tower = "0.4"
-tracing = "0.1.30"
+tracing = "0.1"
diff --git a/linkerd/app/gateway/Cargo.toml b/linkerd/app/gateway/Cargo.toml
@@ -15,7 +15,7 @@ linkerd-app-outbound = { path = "../outbound" }
 thiserror = "1.0"
 tokio = { version = "1", features = ["sync"] }
 tower = { version = "0.4", default-features = false }
-tracing = "0.1.30"
+tracing = "0.1"
 
 [dev-dependencies]
 tokio = { version = "1", features = ["rt", "macros"] }

diff --git a/linkerd/app/inbound/Cargo.toml b/linkerd/app/inbound/Cargo.toml
@@ -23,16 +23,16 @@ thiserror = "1.0"
 tokio = { version = "1", features = ["sync"] }
 tonic = { version = "0.6", default-features = false }
 tower = { version = "0.4", features = ["util"] }
-tracing = "0.1.30"
+tracing = "0.1"
 
 [target.'cfg(fuzzing)'.dependencies]
-hyper = { version = "0.14.17", features = ["http1", "http2"] }
+hyper = { version = "0.14", features = ["http1", "http2"] }
 linkerd-app-test = { path = "../test" }
 arbitrary = { version = "1", features = ["derive"] }
-libfuzzer-sys = { version = "0.4.2", features = ["arbitrary-derive"] }
+libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
 
 [dev-dependencies]
-hyper = { version = "0.14.17", features = ["http1", "http2"] }
+hyper = { version = "0.14", features = ["http1", "http2"] }
 linkerd-app-test = { path = "../test" }
 linkerd-io = { path = "../../io", features = ["tokio-test"] }
 linkerd-meshtls = { path = "../../meshtls", features = ["rustls"] }

diff --git a/linkerd/app/inbound/fuzz/Cargo.toml b/linkerd/app/inbound/fuzz/Cargo.toml
@@ -10,10 +10,10 @@ edition = "2021"
 cargo-fuzz = true
 
 [target.'cfg(fuzzing)'.dependencies]
-arbitrary = { version = "1",  features = ["derive"] }
-hyper = { version = "0.14.9", features = ["http1", "http2"] }
+arbitrary = { version = "1", features = ["derive"] }
+hyper = { version = "0.14", features = ["http1", "http2"] }
 http = "0.2"
-libfuzzer-sys = { version = "0.4.2", features = ["arbitrary-derive"] }
+libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
 linkerd-app-core = { path = "../../core" }
 linkerd-app-inbound = { path = ".." }
 linkerd-app-test = { path = "../../test" }
@@ -35,4 +35,4 @@ test = true
 doc = false
 
 [patch.crates-io]
-webpki = { git = "https://github.com/linkerd/webpki", branch = "cert-dns-names-0.22"}
+webpki = { git = "https://github.com/linkerd/webpki", branch = "cert-dns-names-0.22" }
diff --git a/linkerd/app/integration/Cargo.toml b/linkerd/app/integration/Cargo.toml
@@ -24,7 +24,7 @@ futures = { version = "0.3", default-features = false, features = ["executor"] }
 h2 = "0.3"
 http = "0.2"
 http-body = "0.4"
-hyper = { version = "0.14.17", features = ["http1", "http2", "stream", "client", "server"] }
+hyper = { version = "0.14", features = ["http1", "http2", "stream", "client", "server"] }
 linkerd-app = { path = "..", features = ["allow-loopback"] }
 linkerd-app-core = { path = "../core" }
 linkerd-metrics = { path = "../../metrics", features = ["test_util"] }
@@ -35,16 +35,16 @@ parking_lot = "0.12"
 regex = "1"
 socket2 = "0.4"
 tokio = { version = "1", features = ["io-util", "net", "rt", "macros"] }
-tokio-stream = { version = "0.1.8", features = ["sync"] }
-tokio-rustls = "0.23.2"
-rustls-pemfile = "0.3.0"
+tokio-stream = { version = "0.1", features = ["sync"] }
+tokio-rustls = "0.23"
+rustls-pemfile = "0.3"
 tower = { version = "0.4", default-features = false }
 tonic = { version = "0.6", default-features = false }
-tracing = "0.1.30"
+tracing = "0.1"
 tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "std"] }
 
 [dev-dependencies]
-flate2 = { version = "1.0.22", default-features = false, features = ["rust_backend"] }
+flate2 = { version = "1.0", default-features = false, features = ["rust_backend"] }
 # No code from this crate is actually used; only necessary to enable the Rustls
 # implementation.
 linkerd-meshtls = { path = "../../meshtls", features = ["rustls"] }

diff --git a/linkerd/app/outbound/Cargo.toml b/linkerd/app/outbound/Cargo.toml
@@ -27,11 +27,11 @@ parking_lot = "0.12"
 thiserror = "1.0"
 tokio = { version = "1", features = ["sync"] }
 tower = { version = "0.4", features = ["util"] }
-tracing = "0.1.30"
+tracing = "0.1"
 pin-project = "1"
 
 [dev-dependencies]
-hyper = { version = "0.14.17", features = ["http1", "http2"] }
+hyper = { version = "0.14", features = ["http1", "http2"] }
 linkerd-app-test = { path = "../test" }
 linkerd-io = { path = "../../io", features = ["tokio-test"] }
 linkerd-meshtls = { path = "../../meshtls", features = ["rustls"] }

diff --git a/linkerd/app/test/Cargo.toml b/linkerd/app/test/Cargo.toml
@@ -14,17 +14,17 @@ futures = { version = "0.3", default-features = false }
 h2 = "0.3"
 http = "0.2"
 http-body = "0.4"
-hyper = { version = "0.14.17", features = ["http1", "http2"] }
+hyper = { version = "0.14", features = ["http1", "http2"] }
 linkerd-app-core = { path = "../core" }
 linkerd-identity = { path = "../../identity" }
 linkerd-io = { path = "../../io", features = ["tokio-test"] }
 parking_lot = "0.12"
 regex = "1"
 tokio = { version = "1", features = ["io-util", "net", "rt", "sync"] }
 tokio-test = "0.4"
-tokio-stream = { version = "0.1.8", features = ["sync"] }
+tokio-stream = { version = "0.1", features = ["sync"] }
 tower = { version = "0.4", default-features = false }
-tracing = "0.1.30"
+tracing = "0.1"
 thiserror = "1"
 
 [dependencies.tracing-subscriber]

diff --git a/linkerd/cache/Cargo.toml b/linkerd/cache/Cargo.toml
@@ -13,7 +13,7 @@ linkerd-stack = { path = "../stack" }
 parking_lot = "0.12"
 tokio = { version = "1", default-features = false, features = ["macros", "rt", "sync", "time"] }
 tower = { version = "0.4", default-features = false, features = ["util"] }
-tracing = "0.1.30"
+tracing = "0.1"
 
 [dev-dependencies]
 tokio = { version = "1", default-features = false, features = ["test-util", "time"] }

diff --git a/linkerd/detect/Cargo.toml b/linkerd/detect/Cargo.toml
@@ -15,4 +15,4 @@ linkerd-stack = { path = "../stack" }
 tokio = { version = "1", features = ["time"] }
 thiserror = "1.0"
 tower = "0.4"
-tracing = "0.1.30"
+tracing = "0.1"
diff --git a/linkerd/dns/Cargo.toml b/linkerd/dns/Cargo.toml
@@ -11,6 +11,6 @@ futures = { version = "0.3", default-features = false }
 linkerd-dns-name = { path = "./name" }
 linkerd-error = { path = "../error" }
 thiserror = "1.0"
-tracing = "0.1.30"
+tracing = "0.1"
 trust-dns-resolver = "0.21.0-alpha.5"
 tokio = { version = "1", features = ["rt", "sync", "time"] }
diff --git a/linkerd/dns/fuzz/Cargo.toml b/linkerd/dns/fuzz/Cargo.toml
@@ -13,7 +13,7 @@ cargo-fuzz = true
 libfuzzer-sys = "0.4"
 linkerd-dns = { path = ".." }
 tokio = { version = "1", features = ["rt", "time", "io-util"] }
-tracing = "0.1.29"
+tracing = "0.1"
 linkerd-tracing = { path = "../../tracing", features = ["ansi"] }
 
 # Prevent this from interfering with workspaces

diff --git a/linkerd/duplex/Cargo.toml b/linkerd/duplex/Cargo.toml
@@ -11,5 +11,5 @@ bytes = "1"
 futures = { version = "0.3", default-features = false }
 tokio = { version = "1", features = ["io-util"] }
 pin-project = "1"
-tracing = "0.1.30"
+tracing = "0.1"
 linkerd-io = { path = "../io" }
diff --git a/linkerd/http-access-log/Cargo.toml b/linkerd/http-access-log/Cargo.toml
@@ -17,4 +17,4 @@ linkerd-tls = { path = "../tls" }
 linkerd-proxy-transport = { path = "../proxy/transport" }
 linkerd-tracing = { path = "../tracing" }
 tokio = { version = "1", features = ["time"] }
-tracing = "0.1.30"
+tracing = "0.1"
diff --git a/linkerd/http-metrics/Cargo.toml b/linkerd/http-metrics/Cargo.toml
@@ -11,7 +11,7 @@ bytes = "1"
 futures = { version = "0.3", default-features = false }
 http = "0.2"
 http-body = "0.4"
-hyper = { version = "0.14.17", features = ["http1", "http2"] }
+hyper = { version = "0.14", features = ["http1", "http2"] }
 linkerd-error = { path = "../error" }
 linkerd-http-classify = { path = "../http-classify" }
 linkerd-metrics = { path = "../metrics", features = ["linkerd-stack"] }
@@ -20,4 +20,4 @@ parking_lot = "0.12"
 pin-project = "1"
 tokio = { version = "1", features = ["time"] }
 tower = "0.4"
-tracing = "0.1.30"
+tracing = "0.1"
diff --git a/linkerd/http-retry/Cargo.toml b/linkerd/http-retry/Cargo.toml
@@ -13,11 +13,10 @@ http-body = "0.4"
 http = "0.2"
 linkerd-error = { path = "../error" }
 parking_lot = "0.12"
-tracing = "0.1.30"
+tracing = "0.1"
 thiserror = "1"
 
 [dev-dependencies]
 hyper = "0.14"
 linkerd-tracing = { path = "../tracing", features = ["ansi"] }
-tokio = { version = "1", features = ["macros", "rt"]}
-
+tokio = { version = "1", features = ["macros", "rt"] }
diff --git a/linkerd/meshtls/rustls/Cargo.toml b/linkerd/meshtls/rustls/Cargo.toml
@@ -17,11 +17,11 @@ linkerd-identity = { path = "../../identity" }
 linkerd-stack = { path = "../../stack" }
 linkerd-tls = { path = "../../tls" }
 linkerd-tls-test-util = { path = "../../tls/test-util", optional = true }
-ring = { version = "0.16.19", features = ["std"] }
+ring = { version = "0.16", features = ["std"] }
 rustls-pemfile = "0.3"
 thiserror = "1"
 tokio = { version = "1", features = ["macros", "rt", "sync"] }
-tokio-rustls = { version = "0.23.2", features = ["dangerous_configuration"] }
+tokio-rustls = { version = "0.23", features = ["dangerous_configuration"] }
 tracing = "0.1"
 webpki = "0.22"
 

diff --git a/linkerd/metrics/Cargo.toml b/linkerd/metrics/Cargo.toml
@@ -12,14 +12,14 @@ summary = ["hdrhistogram"]
 test_util = []
 
 [dependencies]
-deflate = { version = "1.0.0", features = ["gzip"] }
+deflate = { version = "1.0", features = ["gzip"] }
 hdrhistogram = { version = "7.5", default-features = false, optional = true }
 http = "0.2"
-hyper = { version = "0.14.17", features = ["http1", "http2"] }
+hyper = { version = "0.14", features = ["http1", "http2"] }
 linkerd-stack = { path = "../stack", optional = true }
 parking_lot = "0.12"
 tokio = { version = "1", features = ["time"] }
-tracing = "0.1.30"
+tracing = "0.1"
 
 [dev-dependencies]
 quickcheck = { version = "1", default-features = false }

diff --git a/linkerd/opencensus/Cargo.toml b/linkerd/opencensus/Cargo.toml
@@ -15,5 +15,5 @@ linkerd-metrics = { path = "../metrics" }
 opencensus-proto = { path = "../../opencensus-proto" }
 tonic = { version = "0.6", default-features = false, features = ["prost", "codegen"] }
 tokio = { version = "1", features = ["macros", "sync", "time"] }
-tokio-stream = { version = "0.1.8", features = ["sync"] }
-tracing = "0.1.30"
+tokio-stream = { version = "0.1", features = ["sync"] }
+tracing = "0.1"
diff --git a/linkerd/proxy/api-resolve/Cargo.toml b/linkerd/proxy/api-resolve/Cargo.toml
@@ -27,4 +27,4 @@ pin-project = "1"
 prost = "0.9"
 tonic = { version = "0.6", default-features = false }
 tower = { version = "0.4", default-features = false }
-tracing = "0.1.30"
+tracing = "0.1"
diff --git a/linkerd/proxy/discover/Cargo.toml b/linkerd/proxy/discover/Cargo.toml
@@ -18,10 +18,10 @@ linkerd-stack = { path = "../../stack" }
 tokio = { version = "1", features = ["rt", "sync", "time"] }
 tokio-util = "0.7"
 tower = { version = "0.4", features = ["discover"] }
-tracing = "0.1.30"
+tracing = "0.1"
 pin-project = "1"
 
 [dev-dependencies]
 async-stream = "0.3"
 tokio = { version = "1", features = ["macros"] }
-tower = { version = "0.4", default-features = false, features = ["discover", "util"]}
+tower = { version = "0.4", default-features = false, features = ["discover", "util"] }
diff --git a/linkerd/proxy/dns-resolve/Cargo.toml b/linkerd/proxy/dns-resolve/Cargo.toml
@@ -17,6 +17,6 @@ linkerd-dns = { path = "../../dns" }
 linkerd-proxy-core = { path = "../core" }
 linkerd-stack = { path = "../../stack" }
 tokio = { version = "1", features = ["sync"] }
-tokio-stream = { version = "0.1.8", features = ["sync"] }
+tokio-stream = { version = "0.1", features = ["sync"] }
 tower = "0.4"
-tracing = "0.1.30"
+tracing = "0.1"
diff --git a/linkerd/proxy/http/Cargo.toml b/linkerd/proxy/http/Cargo.toml
@@ -14,13 +14,13 @@ This should probably be decomposed into smaller, decoupled crates.
 [dependencies]
 async-trait = "0.1"
 bytes = "1"
-drain = "0.1.0"
+drain = "0.1"
 futures = { version = "0.3", default-features = false }
 h2 = "0.3"
 http = "0.2"
 http-body = "0.4"
 httparse = "1.6"
-hyper = { version = "0.14.17", features = ["client", "http1", "http2", "server", "stream", "runtime"] }
+hyper = { version = "0.14", features = ["client", "http1", "http2", "server", "stream", "runtime"] }
 hyper-balance = { path = "../../../hyper-balance" }
 linkerd-detect = { path = "../../detect" }
 linkerd-duplex = { path = "../../duplex" }
@@ -32,7 +32,7 @@ rand = "0.8"
 thiserror = "1.0"
 tokio = { version = "1", features = ["time", "rt"] }
 tower = { version = "0.4", default-features = false, features = ["balance", "load", "discover"] }
-tracing = "0.1.30"
+tracing = "0.1"
 try-lock = "0.2"
 pin-project = "1"
 

diff --git a/linkerd/proxy/identity-client/Cargo.toml b/linkerd/proxy/identity-client/Cargo.toml
@@ -21,5 +21,5 @@ pin-project = "1"
 thiserror = "1"
 tokio = { version = "1", features = ["time", "sync"] }
 tonic = { version = "0.6", default-features = false }
-tracing = "0.1.30"
+tracing = "0.1"
 http-body = "0.4"
diff --git a/linkerd/proxy/tap/Cargo.toml b/linkerd/proxy/tap/Cargo.toml
@@ -11,7 +11,7 @@ rustfmt = ["linkerd2-proxy-api/rustfmt"]
 
 [dependencies]
 http = "0.2"
-hyper = { version = "0.14.17", features = ["http1", "http2"] }
+hyper = { version = "0.14", features = ["http1", "http2"] }
 futures = { version = "0.3", default-features = false }
 ipnet = "2.3"
 linkerd2-proxy-api = { version = "0.3", features = ["tap", "server"] }
@@ -28,7 +28,7 @@ thiserror = "1.0"
 tokio = { version = "1", features = ["time"] }
 tower = { version = "0.4", default-features = false }
 tonic = { version = "0.6", default-features = false }
-tracing = "0.1.30"
+tracing = "0.1"
 pin-project = "1"
 
 [dev-dependencies]

diff --git a/linkerd/proxy/transport/Cargo.toml b/linkerd/proxy/transport/Cargo.toml
@@ -18,7 +18,7 @@ socket2 = "0.4"
 thiserror = "1"
 tokio = { version = "1", features = ["macros", "net"] }
 tokio-stream = { version = "0.1", features = ["net"] }
-tracing = "0.1.30"
+tracing = "0.1"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 libc = "0.2"
diff --git a/linkerd/reconnect/Cargo.toml b/linkerd/reconnect/Cargo.toml
@@ -11,7 +11,7 @@ linkerd-error = { path = "../error" }
 linkerd-stack = { path = "../stack" }
 futures = { version = "0.3", default-features = false }
 tower = { version = "0.4", default-features = false }
-tracing = "0.1.30"
+tracing = "0.1"
 pin-project = "1"
 
 [dev-dependencies]

diff --git a/linkerd/retry/Cargo.toml b/linkerd/retry/Cargo.toml
@@ -11,4 +11,4 @@ futures = { version = "0.3", default-features = false }
 linkerd-error = { path = "../error" }
 linkerd-stack = { path = "../stack" }
 tower = { version = "0.4", default-features = false, features = ["retry"] }
-tracing = "0.1.30"
+tracing = "0.1"
diff --git a/linkerd/service-profiles/Cargo.toml b/linkerd/service-profiles/Cargo.toml
@@ -27,13 +27,13 @@ linkerd-stack = { path = "../stack" }
 linkerd-tonic-watch = { path = "../tonic-watch" }
 linkerd2-proxy-api = { version = "0.3", features = ["destination", "client"] }
 rand = { version = "0.8", features = ["small_rng"] }
-regex = "1.5.4"
+regex = "1.5"
 tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
 tokio-stream = { version = "0.1", features = ["sync"] }
 tonic = { version = "0.6", default-features = false }
-tower = { version = "0.4", features = [ "ready-cache", "retry", "util"] }
+tower = { version = "0.4", features = ["ready-cache", "retry", "util"] }
 thiserror = "1"
-tracing = "0.1.30"
+tracing = "0.1"
 pin-project = "1"
 
 [dev-dependencies]

diff --git a/linkerd/signal/Cargo.toml b/linkerd/signal/Cargo.toml
@@ -8,4 +8,4 @@ publish = false
 
 [dependencies]
 tokio = { version = "1", features = ["macros", "signal"] }
-tracing = "0.1.30"
+tracing = "0.1"
diff --git a/linkerd/stack/tracing/Cargo.toml b/linkerd/stack/tracing/Cargo.toml
@@ -11,4 +11,4 @@ futures = { version = "0.3", default-features = false }
 linkerd-error = { path = "../../error" }
 linkerd-stack = { path = ".." }
 tower = "0.4"
-tracing = "0.1.30"
+tracing = "0.1"
diff --git a/linkerd/system/Cargo.toml b/linkerd/system/Cargo.toml
@@ -14,4 +14,4 @@ tracing = "0.1"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 libc = "0.2"
-procinfo = "0.4.2"
+procinfo = "0.4"
diff --git a/linkerd/tls/Cargo.toml b/linkerd/tls/Cargo.toml
@@ -20,7 +20,7 @@ pin-project = "1"
 thiserror = "1.0"
 tokio = { version = "1", features = ["macros", "time"] }
 tower = "0.4"
-tracing = "0.1.30"
+tracing = "0.1"
 untrusted = "0.7"
 
 [dev-dependencies]