Skip to content

Commit 6df9b9d

Browse files
authored
Rollup merge of rust-lang#120177 - michaelciraci:merge-deps-2, r=Nilstrieb
Remove duplicate dependencies for rustc Removed several duplicates for rustc: rust-lang#75704 Several duplicates still exist, but an external library would have to be updated first. These are the duplicate dependencies still outstanding: ``` annotate-snippets v0.9.1 annotate-snippets v0.10.1 bitflags v1.3.2 bitflags v2.4.1 cargo_metadata v0.15.4 cargo_metadata v0.18.0 darling v0.14.4 darling v0.20.3 darling_core v0.14.4 darling_core v0.20.3 darling_macro v0.14.4 darling_macro v0.20.3 regex-automata v0.1.10 regex-automata v0.2.0 regex-automata v0.4.3 regex-syntax v0.6.29 regex-syntax v0.7.2 regex-syntax v0.8.2 self_cell v0.10.3 self_cell v1.0.2 syn v1.0.109 syn v2.0.32 toml v0.5.11 toml v0.7.5 ``` It should not be hard to consolidate these remaining duplicate dependencies, but it will take time as it would be pull requests for external crates. r? ``@jyn514``
2 parents ab099a3 + df3ec4c commit 6df9b9d

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

Cargo.lock

+15-10
Original file line numberDiff line numberDiff line change
@@ -310,13 +310,12 @@ dependencies = [
310310

311311
[[package]]
312312
name = "bstr"
313-
version = "1.5.0"
313+
version = "1.9.0"
314314
source = "registry+https://github.com/rust-lang/crates.io-index"
315-
checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5"
315+
checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc"
316316
dependencies = [
317317
"memchr",
318-
"once_cell",
319-
"regex-automata 0.1.10",
318+
"regex-automata 0.4.3",
320319
"serde",
321320
]
322321

@@ -1589,11 +1588,11 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
15891588

15901589
[[package]]
15911590
name = "globset"
1592-
version = "0.4.10"
1591+
version = "0.4.13"
15931592
source = "registry+https://github.com/rust-lang/crates.io-index"
1594-
checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
1593+
checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
15951594
dependencies = [
1596-
"aho-corasick 0.7.20",
1595+
"aho-corasick 1.0.2",
15971596
"bstr",
15981597
"fnv",
15991598
"log",
@@ -2370,9 +2369,9 @@ dependencies = [
23702369

23712370
[[package]]
23722371
name = "memchr"
2373-
version = "2.5.0"
2372+
version = "2.7.1"
23742373
source = "registry+https://github.com/rust-lang/crates.io-index"
2375-
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
2374+
checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
23762375
dependencies = [
23772376
"compiler_builtins",
23782377
"rustc-std-workspace-core",
@@ -3183,6 +3182,12 @@ dependencies = [
31833182
"memchr",
31843183
]
31853184

3185+
[[package]]
3186+
name = "regex-automata"
3187+
version = "0.4.3"
3188+
source = "registry+https://github.com/rust-lang/crates.io-index"
3189+
checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
3190+
31863191
[[package]]
31873192
name = "regex-syntax"
31883193
version = "0.6.29"
@@ -5424,7 +5429,7 @@ name = "tidy"
54245429
version = "0.1.0"
54255430
dependencies = [
54265431
"cargo-platform",
5427-
"cargo_metadata 0.15.4",
5432+
"cargo_metadata 0.18.0",
54285433
"ignore",
54295434
"lazy_static",
54305435
"miropt-test-tools",

src/tools/tidy/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55
autobins = false
66

77
[dependencies]
8-
cargo_metadata = "0.15"
8+
cargo_metadata = "0.18"
99
cargo-platform = "0.1.2"
1010
regex = "1"
1111
miropt-test-tools = { path = "../miropt-test-tools" }

0 commit comments

Comments
 (0)