Skip to content

Commit a021acd

Browse files
djcrami3l
authored andcommitted
Drop workspace indirection
1 parent 941f543 commit a021acd

File tree

1 file changed

+23
-52
lines changed

1 file changed

+23
-52
lines changed

Cargo.toml

+23-52
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
22
name = "rustup"
3-
version.workspace = true
4-
edition.workspace = true
5-
license.workspace = true
3+
version = "1.28.1"
4+
edition = "2024"
5+
license = "MIT OR Apache-2.0"
66
description = "Manage multiple rust installations with ease"
77
homepage = "https://github.com/rust-lang/rustup"
88
keywords = ["rustup", "multirust", "install", "proxy"]
@@ -41,7 +41,7 @@ test = ["dep:walkdir"]
4141

4242
# Sorted by alphabetic order
4343
[dependencies]
44-
anyhow.workspace = true
44+
anyhow = "1.0.69"
4545
cfg-if = "1.0"
4646
chrono = { version = "0.4", default-features = false, features = ["std"] }
4747
clap = { version = "4", features = ["derive", "wrap_help"] }
@@ -51,7 +51,7 @@ effective-limits = "0.5.5"
5151
enum-map = "2.5.0"
5252
env_proxy = { version = "0.4.1", optional = true }
5353
flate2 = "1"
54-
fs_at.workspace = true
54+
fs_at = "0.2.1"
5555
git-testament = "0.2"
5656
home = "0.5.4"
5757
itertools = "0.14"
@@ -60,9 +60,9 @@ opener = "0.7.0"
6060
# `openssl` is used by `curl` or `reqwest` backend although it isn't imported by rustup: this
6161
# allows controlling the vendoring status without exposing the presence of the download crate.
6262
openssl = { version = "0.10", optional = true }
63-
opentelemetry = { workspace = true, optional = true }
64-
opentelemetry-otlp = { workspace = true, optional = true }
65-
opentelemetry_sdk = { workspace = true, optional = true }
63+
opentelemetry = { version = "0.29", optional = true }
64+
opentelemetry-otlp = { version = "0.29", features = ["grpc-tonic"], optional = true }
65+
opentelemetry_sdk = { version = "0.29", features = ["rt-tokio"], optional = true }
6666
pulldown-cmark = { version = "0.13", default-features = false }
6767
rand = "0.9"
6868
regex = "1"
@@ -79,20 +79,20 @@ sha2 = "0.10"
7979
sharded-slab = "0.1.1"
8080
strsim = "0.11"
8181
tar = "0.4.26"
82-
tempfile.workspace = true
83-
termcolor.workspace = true
84-
thiserror.workspace = true
82+
tempfile = "3.8"
83+
termcolor = "1.2"
84+
thiserror = "2"
8585
threadpool = "1"
86-
tokio.workspace = true
87-
tokio-retry.workspace = true
88-
tokio-stream.workspace = true
86+
tokio = { version = "1.26.0", default-features = false, features = ["macros", "rt-multi-thread", "sync"] }
87+
tokio-retry = "0.3.0"
88+
tokio-stream = "0.1.14"
8989
toml = "0.8"
90-
tracing.workspace = true
91-
tracing-opentelemetry = { workspace = true, optional = true }
92-
tracing-subscriber = { workspace = true, features = ["env-filter"] }
93-
url.workspace = true
90+
tracing = "0.1"
91+
tracing-opentelemetry = { version = "0.30", optional = true }
92+
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
93+
url = "2.4"
9494
wait-timeout = "0.2"
95-
walkdir = { workspace = true, optional = true }
95+
walkdir = { version = "2", optional = true }
9696
xz2 = "0.1.3"
9797
zstd = "0.13"
9898

@@ -128,46 +128,17 @@ enum-map = "2.5.0"
128128
http-body-util = "0.1.0"
129129
hyper = { version = "1.0", default-features = false, features = ["server", "http1"] }
130130
hyper-util = { version = "0.1.1", features = ["tokio"] }
131-
platforms.workspace = true
132-
proptest.workspace = true
133-
tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
131+
platforms = "3.4"
132+
proptest = "1.1.0"
134133
trycmd = "0.15.0"
135134

136135
[build-dependencies]
137-
platforms.workspace = true
138-
139-
[lints]
140-
workspace = true
141-
142-
[workspace.package]
143-
version = "1.28.1"
144-
edition = "2024"
145-
license = "MIT OR Apache-2.0"
146-
147-
[workspace.dependencies]
148-
anyhow = "1.0.69"
149-
fs_at = "0.2.1"
150-
opentelemetry = "0.29"
151-
opentelemetry-otlp = { version = "0.29", features = ["grpc-tonic"] }
152-
opentelemetry_sdk = { version = "0.29", features = ["rt-tokio"] }
153136
platforms = "3.4"
154-
proptest = "1.1.0"
155-
tempfile = "3.8"
156-
termcolor = "1.2"
157-
thiserror = "2"
158-
tokio = { version = "1.26.0", default-features = false, features = ["macros", "rt-multi-thread"] }
159-
tokio-retry = { version = "0.3.0" }
160-
tokio-stream = { version = "0.1.14" }
161-
tracing = "0.1"
162-
tracing-opentelemetry = "0.30"
163-
tracing-subscriber = "0.3.16"
164-
url = "2.4"
165-
walkdir = "2"
166137

167-
[workspace.lints.rust]
138+
[lints.rust]
168139
rust_2018_idioms = "deny"
169140

170-
[workspace.lints.clippy]
141+
[lints.clippy]
171142
# `dbg!()` and `todo!()` clearly shouldn't make it to production:
172143
dbg_macro = "warn"
173144
todo = "warn"

0 commit comments

Comments
 (0)