Skip to content

Commit 34b8c39

Browse files
MuscraftMuscraft
committed
chore: Use [workspace.dependencies] 
1 parent 2f06c80 commit 34b8c39

File tree

17 files changed

+206
-127
lines changed

17 files changed

+206
-127
lines changed

‎Cargo.toml

+125-42
Original file line numberDiff line numberDiff line change
@@ -10,42 +10,34 @@ exclude = [
1010
"target/", # exclude bench testing
1111
]
1212

13-
[package]
14-
name = "cargo"
15-
version = "0.72.0"
16-
edition = "2021"
17-
license = "MIT OR Apache-2.0"
18-
homepage = "https://crates.io"
19-
repository = "https://github.com/rust-lang/cargo"
20-
documentation = "https://docs.rs/cargo"
21-
readme = "README.md"
22-
description = """
23-
Cargo, a package manager for Rust.
24-
"""
25-
26-
[lib]
27-
name = "cargo"
28-
path = "src/cargo/lib.rs"
29-
30-
[dependencies]
13+
[workspace.dependencies]
3114
anyhow = "1.0.47"
3215
base64 = "0.21.0"
3316
bytesize = "1.0"
17+
cargo = { path = "" }
18+
cargo-credential = { version = "0.2.0", path = "credential/cargo-credential" }
3419
cargo-platform = { path = "crates/cargo-platform", version = "0.1.3" }
35-
cargo-util = { path = "crates/cargo-util", version = "0.2.4" }
36-
clap = { version = "4.2.0", features = ["wrap_help"] }
37-
crates-io = { path = "crates/crates-io", version = "0.36.1" }
38-
curl = { version = "0.4.44", features = ["http2"] }
20+
cargo-test-macro = { path = "crates/cargo-test-macro" }
21+
cargo-test-support = { path = "crates/cargo-test-support" }
22+
cargo-util = { version = "0.2.4", path = "crates/cargo-util" }
23+
cargo_metadata = "0.14.0"
24+
clap = "4.2.0"
25+
core-foundation = { version = "0.9.0", features = ["mac_os_10_7_support"] }
26+
crates-io = { version = "0.36.1", path = "crates/crates-io" }
27+
criterion = { version = "0.3.5", features = ["html_reports"] }
28+
curl = "0.4.44"
3929
curl-sys = "0.4.61"
4030
env_logger = "0.10.0"
4131
filetime = "0.2.9"
4232
flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
33+
fwdansi = "1.1.0"
4334
git2 = "0.17.0"
4435
git2-curl = "0.18.0"
4536
gix = { version = "0.44.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
4637
gix-features-for-configuration-only = { version = "0.29.0", package = "gix-features", features = [ "parallel" ] }
4738
glob = "0.3.0"
48-
hex = "0.4"
39+
handlebars = { version = "3.2.1", features = ["dir_source"] }
40+
hex = "0.4.2"
4941
hmac = "0.12.1"
5042
home = "0.5.5"
5143
http-auth = { version = "0.1.6", default-features = false }
@@ -56,46 +48,137 @@ indexmap = "1"
5648
is-terminal = "0.4.4"
5749
itertools = "0.10.0"
5850
jobserver = "0.1.26"
59-
lazy_static = "1.2.0"
51+
lazy_static = "1.3.0"
6052
lazycell = "1.2.0"
61-
libc = "0.2"
53+
libc = "0.2.88"
6254
libgit2-sys = "0.15.0"
63-
log = "0.4.6"
55+
log = "0.4.17"
6456
memchr = "2.1.3"
57+
miow = "0.5.0"
6558
opener = "0.5"
59+
openssl ="0.10.50"
6660
os_info = "3.5.0"
6761
pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] }
6862
pathdiff = "0.2"
69-
pretty_env_logger = { version = "0.4", optional = true }
63+
percent-encoding = "2.0"
64+
pkg-config = "0.3.19"
65+
pretty_assertions = "1.3.0"
66+
pretty_env_logger = "0.4"
67+
proptest = "1.1.0"
68+
pulldown-cmark = { version = "0.9.2", default-features = false }
7069
rand = "0.8.5"
7170
rustfix = "0.6.0"
71+
same-file = "1.0.6"
72+
security-framework = "2.0.0"
7273
semver = { version = "1.0.3", features = ["serde"] }
73-
serde = { version = "1.0.123", features = ["derive"] }
74+
serde = "1.0.123"
7475
serde-value = "0.7.0"
7576
serde_ignored = "0.1.0"
76-
serde_json = { version = "1.0.30", features = ["raw_value"] }
77+
serde_json = "1.0.59"
7778
sha1 = "0.10.5"
79+
sha2 = "0.10.6"
7880
shell-escape = "0.1.4"
81+
snapbox = { version = "0.4.0", features = ["diff", "path"] }
7982
strip-ansi-escapes = "0.1.0"
8083
tar = { version = "0.4.38", default-features = false }
81-
tempfile = "3.0"
82-
termcolor = "1.1"
83-
time = { version = "0.3", features = ["parsing", "formatting"]}
84+
tempfile = "3.1.0"
85+
termcolor = "1.1.2"
86+
time = { version = "0.3", features = ["parsing", "formatting"] }
8487
toml = "0.7.0"
8588
toml_edit = "0.19.0"
8689
unicode-width = "0.1.5"
8790
unicode-xid = "0.2.0"
8891
url = "2.2.2"
89-
walkdir = "2.2"
92+
varisat = "0.2.1"
93+
walkdir = "2.3.1"
94+
windows-sys = "0.48"
95+
96+
[package]
97+
name = "cargo"
98+
version = "0.72.0"
99+
edition = "2021"
100+
license = "MIT OR Apache-2.0"
101+
homepage = "https://crates.io"
102+
repository = "https://github.com/rust-lang/cargo"
103+
documentation = "https://docs.rs/cargo"
104+
readme = "README.md"
105+
description = """
106+
Cargo, a package manager for Rust.
107+
"""
108+
109+
[lib]
110+
name = "cargo"
111+
path = "src/cargo/lib.rs"
112+
113+
[dependencies]
114+
anyhow.workspace = true
115+
base64.workspace = true
116+
bytesize.workspace = true
117+
cargo-platform.workspace = true
118+
cargo-util.workspace = true
119+
clap = { workspace = true, features = ["wrap_help"] }
120+
crates-io.workspace = true
121+
curl = { workspace = true, features = ["http2"] }
122+
curl-sys.workspace = true
123+
env_logger.workspace = true
124+
filetime.workspace = true
125+
flate2.workspace = true
126+
git2.workspace = true
127+
git2-curl.workspace = true
128+
gix.workspace = true
129+
gix-features-for-configuration-only.workspace = true
130+
glob.workspace = true
131+
hex.workspace = true
132+
hmac.workspace = true
133+
home.workspace = true
134+
http-auth.workspace = true
135+
humantime.workspace = true
136+
ignore.workspace = true
137+
im-rc.workspace = true
138+
indexmap.workspace = true
139+
is-terminal.workspace = true
140+
itertools.workspace = true
141+
jobserver.workspace = true
142+
lazy_static.workspace = true
143+
lazycell.workspace = true
144+
libc.workspace = true
145+
libgit2-sys.workspace = true
146+
log.workspace = true
147+
memchr.workspace = true
148+
opener.workspace = true
149+
os_info.workspace = true
150+
pasetors.workspace = true
151+
pathdiff.workspace = true
152+
pretty_env_logger = { workspace = true, optional = true }
153+
rand.workspace = true
154+
rustfix.workspace = true
155+
semver.workspace = true
156+
serde = { workspace = true, features = ["derive"] }
157+
serde-value.workspace = true
158+
serde_ignored.workspace = true
159+
serde_json = { workspace = true, features = ["raw_value"] }
160+
sha1.workspace = true
161+
shell-escape.workspace = true
162+
strip-ansi-escapes.workspace = true
163+
tar.workspace = true
164+
tempfile.workspace = true
165+
termcolor.workspace = true
166+
time.workspace = true
167+
toml.workspace = true
168+
toml_edit.workspace = true
169+
unicode-width.workspace = true
170+
unicode-xid.workspace = true
171+
url.workspace = true
172+
walkdir.workspace = true
90173

91174
[target.'cfg(not(windows))'.dependencies]
92-
openssl = { version = "0.10.50", optional = true }
175+
openssl = { workspace = true, optional = true }
93176

94177
[target.'cfg(windows)'.dependencies]
95-
fwdansi = "1.1.0"
178+
fwdansi.workspace = true
96179

97180
[target.'cfg(windows)'.dependencies.windows-sys]
98-
version = "0.48"
181+
workspace = true
99182
features = [
100183
"Win32_Foundation",
101184
"Win32_Storage_FileSystem",
@@ -108,14 +191,14 @@ features = [
108191
]
109192

110193
[dev-dependencies]
111-
cargo-test-macro = { path = "crates/cargo-test-macro" }
112-
cargo-test-support = { path = "crates/cargo-test-support" }
113-
same-file = "1.0.6"
114-
snapbox = { version = "0.4.0", features = ["diff", "path"] }
194+
cargo-test-macro.workspace = true
195+
cargo-test-support.workspace = true
196+
same-file.workspace = true
197+
snapbox.workspace = true
115198

116199
[build-dependencies]
117-
flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
118-
tar = { version = "0.4.38", default-features = false }
200+
flate2.workspace = true
201+
tar.workspace = true
119202

120203
[[bin]]
121204
name = "cargo"

‎benches/benchsuite/Cargo.toml

+5-6
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ description = "Benchmarking suite for Cargo."
99
publish = false
1010

1111
[dependencies]
12-
cargo = { path = "../.." }
13-
# Consider removing html_reports in 0.4 and switching to `cargo criterion`.
14-
criterion = { version = "0.3.5", features = ["html_reports"] }
15-
flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
16-
tar = { version = "0.4.38", default-features = false }
17-
url = "2.2.2"
12+
cargo.workspace = true
13+
criterion.workspace = true
14+
flate2.workspace = true
15+
tar.workspace = true
16+
url.workspace = true
1817

1918
[lib]
2019
bench = false

‎benches/capture/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0"
66
description = "Tool for capturing a real-world workspace for benchmarking."
77

88
[dependencies]
9-
cargo_metadata = "0.14.0"
10-
flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
11-
tar = { version = "0.4.38", default-features = false }
12-
toml = "0.7.0"
9+
cargo_metadata.workspace = true
10+
flate2.workspace = true
11+
tar.workspace = true
12+
toml.workspace = true

‎crates/cargo-platform/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ documentation = "https://docs.rs/cargo-platform"
99
description = "Cargo's representation of a target platform."
1010

1111
[dependencies]
12-
serde = "1.0.82"
12+
serde.workspace = true

‎crates/cargo-test-support/Cargo.toml

+20-20
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ edition = "2021"
88
doctest = false
99

1010
[dependencies]
11-
anyhow = "1.0.34"
12-
cargo-test-macro = { path = "../cargo-test-macro" }
13-
cargo-util = { path = "../cargo-util" }
14-
crates-io = { path = "../crates-io" }
15-
filetime = "0.2"
16-
flate2 = { version = "1.0", default-features = false, features = ["zlib"] }
17-
git2 = "0.17.0"
18-
glob = "0.3"
19-
itertools = "0.10.0"
20-
lazy_static = "1.0"
21-
pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] }
22-
serde = { version = "1.0.123", features = ["derive"] }
23-
serde_json = "1.0"
24-
snapbox = { version = "0.4.0", features = ["diff", "path"] }
25-
tar = { version = "0.4.38", default-features = false }
26-
termcolor = "1.1.2"
27-
time = { version = "0.3", features = ["parsing", "formatting"]}
28-
toml = "0.7.0"
29-
url = "2.2.2"
11+
anyhow.workspace = true
12+
cargo-test-macro.workspace = true
13+
cargo-util.workspace = true
14+
crates-io.workspace = true
15+
filetime.workspace = true
16+
flate2.workspace = true
17+
git2.workspace = true
18+
glob.workspace = true
19+
itertools.workspace = true
20+
lazy_static.workspace = true
21+
pasetors.workspace = true
22+
serde = { workspace = true, features = ["derive"] }
23+
serde_json.workspace = true
24+
snapbox.workspace = true
25+
tar.workspace = true
26+
termcolor.workspace = true
27+
time.workspace = true
28+
toml.workspace = true
29+
url.workspace = true
3030

3131
[target.'cfg(windows)'.dependencies]
32-
windows-sys = { version = "0.48.0", features = ["Win32_Storage_FileSystem"] }
32+
windows-sys = { workspace = true, features = ["Win32_Storage_FileSystem"] }

‎crates/cargo-util/Cargo.toml

+14-14
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ repository = "https://github.com/rust-lang/cargo"
88
description = "Miscellaneous support code used by Cargo."
99

1010
[dependencies]
11-
anyhow = "1.0.34"
12-
sha2 = "0.10.6"
13-
filetime = "0.2.9"
14-
hex = "0.4.2"
15-
jobserver = "0.1.26"
16-
libc = "0.2.88"
17-
log = "0.4.6"
18-
same-file = "1.0.6"
19-
shell-escape = "0.1.4"
20-
tempfile = "3.1.0"
21-
walkdir = "2.3.1"
11+
anyhow.workspace = true
12+
sha2.workspace = true
13+
filetime.workspace = true
14+
hex.workspace = true
15+
jobserver.workspace = true
16+
libc.workspace = true
17+
log.workspace = true
18+
same-file.workspace = true
19+
shell-escape.workspace = true
20+
tempfile.workspace = true
21+
walkdir.workspace = true
2222

2323
[target.'cfg(target_os = "macos")'.dependencies]
24-
core-foundation = { version = "0.9.0", features = ["mac_os_10_7_support"] }
24+
core-foundation.workspace = true
2525

2626
[target.'cfg(windows)'.dependencies]
27-
miow = "0.5.0"
28-
windows-sys = { version = "0.48.0", features = ["Win32_Storage_FileSystem", "Win32_Foundation", "Win32_System_Console"] }
27+
miow.workspace = true
28+
windows-sys = { workspace = true, features = ["Win32_Storage_FileSystem", "Win32_Foundation", "Win32_System_Console"] }

‎crates/crates-io/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ name = "crates_io"
1313
path = "lib.rs"
1414

1515
[dependencies]
16-
anyhow = "1.0.34"
17-
curl = "0.4"
18-
percent-encoding = "2.0"
19-
serde = { version = "1.0", features = ['derive'] }
20-
serde_json = "1.0"
21-
url = "2.0"
16+
anyhow.workspace = true
17+
curl.workspace = true
18+
percent-encoding.workspace = true
19+
serde = { workspace = true, features = ["derive"] }
20+
serde_json.workspace = true
21+
url.workspace = true

‎crates/home/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ repository = "https://github.com/rust-lang/cargo"
1717
description = "Shared definitions of home directories."
1818

1919
[target.'cfg(windows)'.dependencies]
20-
windows-sys = { version = "0.48.0", features = ["Win32_Foundation", "Win32_UI_Shell"] }
20+
windows-sys = { workspace = true, features = ["Win32_Foundation", "Win32_UI_Shell"] }

‎crates/mdman/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ description = "Creates a man page page from markdown."
77
publish = false
88

99
[dependencies]
10-
anyhow = "1.0.31"
11-
handlebars = { version = "3.2.1", features = ["dir_source"] }
12-
pulldown-cmark = { version = "0.9.2", default-features = false }
13-
same-file = "1.0.6"
14-
serde_json = "1.0.56"
15-
url = "2.2.2"
10+
anyhow.workspace = true
11+
handlebars.workspace = true
12+
pulldown-cmark.workspace = true
13+
same-file.workspace = true
14+
serde_json.workspace = true
15+
url.workspace = true
1616

1717
[dev-dependencies]
18-
pretty_assertions = "1.3.0"
18+
pretty_assertions.workspace = true

0 commit comments

Comments
 (0)