Skip to content

Commit ac84cb5

Browse files
committed
Drop workspace indirection
1 parent 361f7cc commit ac84cb5

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"]
@@ -45,7 +45,7 @@ test = ["dep:walkdir"]
4545

4646
# Sorted by alphabetic order
4747
[dependencies]
48-
anyhow.workspace = true
48+
anyhow = "1.0.69"
4949
cfg-if = "1.0"
5050
chrono = { version = "0.4", default-features = false, features = ["std"] }
5151
clap = { version = "4", features = ["derive", "wrap_help"] }
@@ -55,7 +55,7 @@ effective-limits = "0.5.5"
5555
enum-map = "2.5.0"
5656
env_proxy = { version = "0.4.1", optional = true }
5757
flate2 = "1"
58-
fs_at.workspace = true
58+
fs_at = "0.2.1"
5959
git-testament = "0.2"
6060
home = "0.5.4"
6161
itertools = "0.14"
@@ -64,9 +64,9 @@ opener = "0.7.0"
6464
# `openssl` is used by `curl` or `reqwest` backend although it isn't imported by rustup: this
6565
# allows controlling the vendoring status without exposing the presence of the download crate.
6666
openssl = { version = "0.10", optional = true }
67-
opentelemetry = { workspace = true, optional = true }
68-
opentelemetry-otlp = { workspace = true, optional = true }
69-
opentelemetry_sdk = { workspace = true, optional = true }
67+
opentelemetry = { version = "0.29", optional = true }
68+
opentelemetry-otlp = { version = "0.29", features = ["grpc-tonic"], optional = true }
69+
opentelemetry_sdk = { version = "0.29", features = ["rt-tokio"], optional = true }
7070
pulldown-cmark = { version = "0.13", default-features = false }
7171
rand = "0.9"
7272
regex = "1"
@@ -83,20 +83,20 @@ sha2 = "0.10"
8383
sharded-slab = "0.1.1"
8484
strsim = "0.11"
8585
tar = "0.4.26"
86-
tempfile.workspace = true
87-
termcolor.workspace = true
88-
thiserror.workspace = true
86+
tempfile = "3.8"
87+
termcolor = "1.2"
88+
thiserror = "2"
8989
threadpool = "1"
90-
tokio.workspace = true
91-
tokio-retry.workspace = true
92-
tokio-stream.workspace = true
90+
tokio = { version = "1.26.0", default-features = false, features = ["macros", "rt-multi-thread", "sync"] }
91+
tokio-retry = "0.3.0"
92+
tokio-stream = "0.1.14"
9393
toml = "0.8"
94-
tracing.workspace = true
95-
tracing-opentelemetry = { workspace = true, optional = true }
96-
tracing-subscriber = { workspace = true, features = ["env-filter"] }
97-
url.workspace = true
94+
tracing = "0.1"
95+
tracing-opentelemetry = { version = "0.30", optional = true }
96+
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
97+
url = "2.4"
9898
wait-timeout = "0.2"
99-
walkdir = { workspace = true, optional = true }
99+
walkdir = { version = "2", optional = true }
100100
xz2 = "0.1.3"
101101
zstd = "0.13"
102102

@@ -132,46 +132,17 @@ enum-map = "2.5.0"
132132
http-body-util = "0.1.0"
133133
hyper = { version = "1.0", default-features = false, features = ["server", "http1"] }
134134
hyper-util = { version = "0.1.1", features = ["tokio"] }
135-
platforms.workspace = true
136-
proptest.workspace = true
137-
tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
135+
platforms = "3.4"
136+
proptest = "1.1.0"
138137
trycmd = "0.15.0"
139138

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

171-
[workspace.lints.rust]
142+
[lints.rust]
172143
rust_2018_idioms = "deny"
173144

174-
[workspace.lints.clippy]
145+
[lints.clippy]
175146
# `dbg!()` and `todo!()` clearly shouldn't make it to production:
176147
dbg_macro = "warn"
177148
todo = "warn"

0 commit comments

Comments
 (0)