Use uniform dependency specification style

Author: djc

Cargo.toml

@@ -64,12 +64,17 @@ lazy_static.workspace = true
 libc = "0.2"
 once_cell = { workspace = true, optional = true }
 opener = "0.6.0"
+# `openssl` is used by `curl` or `reqwest` backend although it isn't imported by rustup: this
+# allows controlling the vendoring status without exposing the presence of the download crate.
+openssl = { version = "0.10", optional = true }
 opentelemetry = { workspace = true, optional = true }
 opentelemetry-otlp = { workspace = true, optional = true }
 pulldown-cmark = { version = "0.9", default-features = false }
 rand = "0.8"
 regex = "1"
 remove_dir_all = { version = "0.8.1", features = ["parallel"] }
+retry = { version = "2", default-features = false, features = ["random"] }
+rs_tracing = { version = "1.1", features = ["rs_tracing"] }
 same-file = "1"
 scopeguard = "1"
 semver = "1.0"
@@ -85,32 +90,14 @@ threadpool = "1"
 tokio = { workspace = true, optional = true }
 toml = "0.8"
 tracing-opentelemetry = { workspace = true, optional = true }
-tracing-subscriber = { workspace = true, optional = true, features = [
-    "env-filter",
-] }
+tracing-subscriber = { workspace = true, optional = true, features = ["env-filter"] }
 tracing.workspace = true
 url.workspace = true
 wait-timeout = "0.2"
 walkdir = { workspace = true, optional = true }
 xz2 = "0.1.3"
 zstd = "0.13"
 
-[dependencies.openssl]
-# Used by `curl` or `reqwest` backend although it isn't imported by our rustup :
-# this allows controlling the vendoring status without exposing the presence of
-# the download crate.
-optional = true
-version = "0.10"
-
-[dependencies.retry]
-default-features = false
-features = ["random"]
-version = "2.0.0"
-
-[dependencies.rs_tracing]
-features = ["rs_tracing"]
-version = "1.1.0"
-
 [target."cfg(windows)".dependencies]
 cc = "1"
 winreg = "0.51"
@@ -155,7 +142,6 @@ features = [
 ]
 version = "0.48.0"
 
-
 [dev-dependencies]
 enum-map = "2.5.0"
 once_cell.workspace = true
@@ -185,9 +171,7 @@ rustup-macros = { path = "rustup-macros" }
 tempfile = "3.8"
 termcolor = "1.2"
 thiserror = "1.0"
-tokio = { version = "1.26.0", default-features = false, features = [
-    "rt-multi-thread",
-] }
+tokio = { version = "1.26.0", default-features = false, features = ["rt-multi-thread"] }
 tracing = "0.1"
 tracing-opentelemetry = { version = "0.21.0" }
 tracing-subscriber = "0.3.16"

download/Cargo.toml

@@ -20,18 +20,11 @@ anyhow.workspace = true
 curl = { version = "0.4.44", optional = true }
 env_proxy = { version = "0.4.1", optional = true }
 lazy_static = { workspace = true, optional = true }
-reqwest = { version = "0.11", default-features = false, features = [
-    "blocking",
-    "gzip",
-    "socks",
-], optional = true }
+reqwest = { version = "0.11", default-features = false, features = ["blocking", "gzip", "socks"], optional = true }
 thiserror.workspace = true
 url.workspace = true
 
 [dev-dependencies]
-hyper = { version = "0.14", default-features = false, features = [
-    "tcp",
-    "server",
-] }
+hyper = { version = "0.14", default-features = false, features = ["tcp", "server"] }
 tempfile.workspace = true
 tokio = { workspace = true, default-features = false, features = ["sync"] }