Skip to content

Commit 413f1a5

Browse files
authored
Unrolled build for #145729
Rollup merge of #145729 - nnethercote:dup-packages, r=calebcartwright Remove two duplicated crates These commits remove `toml-0.5.11` and `dirs-sys-0.4.1`. There are later versions of those same crates already in the tree. Found with `cargo tree -d`. r? ``@jieyouxu``
2 parents 69b76df + c54db96 commit 413f1a5

File tree

4 files changed

+9
-30
lines changed

4 files changed

+9
-30
lines changed

Cargo.lock

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ dependencies = [
315315
"serde_json",
316316
"sha2",
317317
"tar",
318-
"toml 0.5.11",
318+
"toml 0.7.8",
319319
"xz2",
320320
]
321321

@@ -336,7 +336,7 @@ dependencies = [
336336
"curl",
337337
"indexmap",
338338
"serde",
339-
"toml 0.5.11",
339+
"toml 0.7.8",
340340
]
341341

342342
[[package]]
@@ -1129,16 +1129,16 @@ version = "6.0.0"
11291129
source = "registry+https://github.com/rust-lang/crates.io-index"
11301130
checksum = "16f5094c54661b38d03bd7e50df373292118db60b585c08a411c6d840017fe7d"
11311131
dependencies = [
1132-
"dirs-sys 0.5.0",
1132+
"dirs-sys",
11331133
]
11341134

11351135
[[package]]
11361136
name = "dirs"
1137-
version = "5.0.1"
1137+
version = "6.0.0"
11381138
source = "registry+https://github.com/rust-lang/crates.io-index"
1139-
checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
1139+
checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
11401140
dependencies = [
1141-
"dirs-sys 0.4.1",
1141+
"dirs-sys",
11421142
]
11431143

11441144
[[package]]
@@ -1151,18 +1151,6 @@ dependencies = [
11511151
"dirs-sys-next",
11521152
]
11531153

1154-
[[package]]
1155-
name = "dirs-sys"
1156-
version = "0.4.1"
1157-
source = "registry+https://github.com/rust-lang/crates.io-index"
1158-
checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
1159-
dependencies = [
1160-
"libc",
1161-
"option-ext",
1162-
"redox_users 0.4.6",
1163-
"windows-sys 0.48.0",
1164-
]
1165-
11661154
[[package]]
11671155
name = "dirs-sys"
11681156
version = "0.5.0"
@@ -5545,15 +5533,6 @@ version = "0.1.1"
55455533
source = "registry+https://github.com/rust-lang/crates.io-index"
55465534
checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
55475535

5548-
[[package]]
5549-
name = "toml"
5550-
version = "0.5.11"
5551-
source = "registry+https://github.com/rust-lang/crates.io-index"
5552-
checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
5553-
dependencies = [
5554-
"serde",
5555-
]
5556-
55575536
[[package]]
55585537
name = "toml"
55595538
version = "0.7.8"

src/tools/build-manifest/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
toml = "0.5"
7+
toml = "0.7"
88
serde = { version = "1.0", features = ["derive"] }
99
serde_json = "1.0"
1010
anyhow = "1.0.32"

src/tools/bump-stage0/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ build_helper = { path = "../../build_helper" }
1111
curl = "0.4.38"
1212
indexmap = { version = "2.0.0", features = ["serde"] }
1313
serde = { version = "1.0.125", features = ["derive"] }
14-
toml = "0.5.7"
14+
toml = "0.7"

src/tools/rustfmt/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ cargo_metadata = "0.18"
4040
clap = { version = "4.4.2", features = ["derive"] }
4141
clap-cargo = "0.12.0"
4242
diff = "0.1"
43-
dirs = "5.0"
43+
dirs = "6.0"
4444
getopts = "0.2"
4545
ignore = "0.4"
4646
itertools = "0.12"

0 commit comments

Comments
 (0)