Skip to content

Commit ac07b42

Browse files
MuscraftMuscraft
committed
chore: Use [workspace.dependencies] 
1 parent ac84010 commit ac07b42

File tree

17 files changed

+140
-106
lines changed

17 files changed

+140
-106
lines changed

‎Cargo.toml‎

Lines changed: 72 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,43 @@ exclude = [
1010
"target/", # exclude bench testing
1111
]
1212

13+
[workspace.dependencies]
14+
anyhow = "1.0.47"
15+
cargo = { path = "" }
16+
cargo-credential = { version = "0.2.0", path = "credential/cargo-credential" }
17+
cargo-test-macro = { path = "crates/cargo-test-macro" }
18+
cargo-util = { version = "0.2.4", path = "crates/cargo-util" }
19+
clap = "4.2.0"
20+
crates-io = { version = "0.36.1", path = "crates/crates-io" }
21+
curl = "0.4.44"
22+
env_logger = "0.10.0"
23+
filetime = "0.2.9"
24+
flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
25+
git2 = "0.17.0"
26+
glob = "0.3.0"
27+
hex = "0.4.2"
28+
is-terminal = "0.4.4"
29+
itertools = "0.10.0"
30+
jobserver = "0.1.26"
31+
lazy_static = "1.3.0"
32+
libc = "0.2.88"
33+
log = "0.4.17"
34+
pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] }
35+
same-file = "1.0.6"
36+
serde = "1.0.123"
37+
serde_json = "1.0.59"
38+
shell-escape = "0.1.4"
39+
snapbox = { version = "0.4.0", features = ["diff", "path"] }
40+
tar = { version = "0.4.38", default-features = false }
41+
tempfile = "3.1.0"
42+
termcolor = "1.1.2"
43+
time = { version = "0.3", features = ["parsing", "formatting"] }
44+
toml = "0.7.0"
45+
toml_edit = "0.19.0"
46+
url = "2.2.2"
47+
walkdir = "2.3.1"
48+
windows-sys = "0.48"
49+
1350
[package]
1451
name = "cargo"
1552
version = "0.72.0"
@@ -28,65 +65,65 @@ name = "cargo"
2865
path = "src/cargo/lib.rs"
2966

3067
[dependencies]
31-
anyhow = "1.0.47"
68+
anyhow.workspace = true
3269
base64 = "0.21.0"
3370
bytesize = "1.0"
3471
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"] }
72+
cargo-util.workspace = true
73+
clap = { workspace = true, features = ["wrap_help"] }
74+
crates-io.workspace = true
75+
curl = { workspace = true, features = ["http2"] }
3976
curl-sys = "0.4.61"
40-
env_logger = "0.10.0"
41-
filetime = "0.2.9"
42-
flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
43-
git2 = "0.17.0"
77+
env_logger.workspace = true
78+
filetime.workspace = true
79+
flate2.workspace = true
80+
git2.workspace = true
4481
git2-curl = "0.18.0"
4582
gix = { version = "0.39.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
4683
gix-features-for-configuration-only = { version = "0.28.0", package = "gix-features", features = [ "parallel" ] }
47-
glob = "0.3.0"
48-
hex = "0.4"
84+
glob.workspace = true
85+
hex.workspace = true
4986
hmac = "0.12.1"
5087
home = "0.5.5"
5188
http-auth = { version = "0.1.6", default-features = false }
5289
humantime = "2.0.0"
5390
ignore = "0.4.7"
5491
im-rc = "15.0.0"
5592
indexmap = "1"
56-
is-terminal = "0.4.4"
57-
itertools = "0.10.0"
58-
jobserver = "0.1.26"
59-
lazy_static = "1.2.0"
93+
is-terminal.workspace = true
94+
itertools.workspace = true
95+
jobserver.workspace = true
96+
lazy_static.workspace = true
6097
lazycell = "1.2.0"
61-
libc = "0.2"
98+
libc.workspace = true
6299
libgit2-sys = "0.15.0"
63-
log = "0.4.6"
100+
log.workspace = true
64101
memchr = "2.1.3"
65102
opener = "0.5"
66103
os_info = "3.5.0"
67-
pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] }
104+
pasetors.workspace = true
68105
pathdiff = "0.2"
69106
pretty_env_logger = { version = "0.4", optional = true }
70107
rand = "0.8.5"
71108
rustfix = "0.6.0"
72109
semver = { version = "1.0.3", features = ["serde"] }
73-
serde = { version = "1.0.123", features = ["derive"] }
110+
serde = { workspace = true, features = ["derive"] }
74111
serde-value = "0.7.0"
75112
serde_ignored = "0.1.0"
76-
serde_json = { version = "1.0.30", features = ["raw_value"] }
113+
serde_json = { workspace = true, features = ["raw_value"] }
77114
sha1 = "0.10.5"
78-
shell-escape = "0.1.4"
115+
shell-escape.workspace = true
79116
strip-ansi-escapes = "0.1.0"
80-
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-
toml = "0.7.0"
85-
toml_edit = "0.19.0"
117+
tar.workspace = true
118+
tempfile.workspace = true
119+
termcolor.workspace = true
120+
time.workspace = true
121+
toml.workspace = true
122+
toml_edit.workspace = true
86123
unicode-width = "0.1.5"
87124
unicode-xid = "0.2.0"
88-
url = "2.2.2"
89-
walkdir = "2.2"
125+
url.workspace = true
126+
walkdir.workspace = true
90127

91128
[target.'cfg(not(windows))'.dependencies]
92129
openssl = { version = "0.10.50", optional = true }
@@ -95,7 +132,7 @@ openssl = { version = "0.10.50", optional = true }
95132
fwdansi = "1.1.0"
96133

97134
[target.'cfg(windows)'.dependencies.windows-sys]
98-
version = "0.48"
135+
workspace = true
99136
features = [
100137
"Win32_Foundation",
101138
"Win32_Storage_FileSystem",
@@ -108,14 +145,14 @@ features = [
108145
]
109146

110147
[dev-dependencies]
111-
cargo-test-macro = { path = "crates/cargo-test-macro" }
148+
cargo-test-macro.workspace = true
112149
cargo-test-support = { path = "crates/cargo-test-support" }
113-
same-file = "1.0.6"
114-
snapbox = { version = "0.4.0", features = ["diff", "path"] }
150+
same-file.workspace = true
151+
snapbox.workspace = true
115152

116153
[build-dependencies]
117-
flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
118-
tar = { version = "0.4.38", default-features = false }
154+
flate2.workspace = true
155+
tar.workspace = true
119156

120157
[[bin]]
121158
name = "cargo"

‎benches/benchsuite/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ description = "Benchmarking suite for Cargo."
99
publish = false
1010

1111
[dependencies]
12-
cargo = { path = "../.." }
12+
cargo.workspace = true
1313
# Consider removing html_reports in 0.4 and switching to `cargo criterion`.
1414
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"
15+
flate2.workspace = true
16+
tar.workspace = true
17+
url.workspace = true
1818

1919
[lib]
2020
bench = false

‎benches/capture/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ description = "Tool for capturing a real-world workspace for benchmarking."
77

88
[dependencies]
99
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"
10+
flate2.workspace = true
11+
tar.workspace = true
12+
toml.workspace = true

‎crates/cargo-platform/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 20 additions & 20 deletions
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‎

Lines changed: 11 additions & 11 deletions
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"
11+
anyhow.workspace = true
1212
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"
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]
2424
core-foundation = { version = "0.9.0", features = ["mac_os_10_7_support"] }
2525

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

‎crates/crates-io/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
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"
16+
anyhow.workspace = true
17+
curl.workspace = true
1818
percent-encoding = "2.0"
19-
serde = { version = "1.0", features = ['derive'] }
20-
serde_json = "1.0"
21-
url = "2.0"
19+
serde = { workspace = true, features = ["derive"] }
20+
serde_json.workspace = true
21+
url.workspace = true

‎crates/home/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 4 additions & 4 deletions
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"
10+
anyhow.workspace = true
1111
handlebars = { version = "3.2.1", features = ["dir_source"] }
1212
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"
13+
same-file.workspace = true
14+
serde_json.workspace = true
15+
url.workspace = true
1616

1717
[dev-dependencies]
1818
pretty_assertions = "1.3.0"

‎crates/resolver-tests/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ edition = "2018"
55
publish = false
66

77
[dependencies]
8-
cargo = { path = "../.." }
9-
cargo-util = { path = "../cargo-util" }
10-
is-terminal = "0.4.0"
11-
lazy_static = "1.3.0"
8+
cargo.workspace = true
9+
cargo-util.workspace = true
10+
is-terminal.workspace = true
11+
lazy_static.workspace = true
1212
proptest = "1.1.0"
1313
varisat = "0.2.1"

0 commit comments

Comments
 (0)