Skip to content

Commit 52d8c49

Browse files
committed
Auto merge of #113304 - cuviper:indexmap-2, r=Mark-Simulacrum
Upgrade to indexmap 2.0.0 The new version was already added to the tree as an indirect dependency in #113046, but now our direct dependents are using it too.
2 parents 0130c3a + 2b091ff commit 52d8c49

File tree

6 files changed

+12
-20
lines changed

6 files changed

+12
-20
lines changed

Cargo.lock

+6-6
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ version = "0.1.0"
335335
dependencies = [
336336
"anyhow",
337337
"curl",
338-
"indexmap 1.9.3",
338+
"indexmap 2.0.0",
339339
"serde",
340340
"serde_json",
341341
"toml 0.5.11",
@@ -1694,8 +1694,6 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
16941694
dependencies = [
16951695
"autocfg",
16961696
"hashbrown 0.12.3",
1697-
"rustc-rayon",
1698-
"serde",
16991697
]
17001698

17011699
[[package]]
@@ -1706,6 +1704,8 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
17061704
dependencies = [
17071705
"equivalent",
17081706
"hashbrown 0.14.0",
1707+
"rustc-rayon",
1708+
"serde",
17091709
]
17101710

17111711
[[package]]
@@ -3190,7 +3190,7 @@ dependencies = [
31903190
"cfg-if",
31913191
"elsa",
31923192
"ena",
3193-
"indexmap 1.9.3",
3193+
"indexmap 2.0.0",
31943194
"itertools",
31953195
"jobserver",
31963196
"libc",
@@ -3968,7 +3968,7 @@ dependencies = [
39683968
name = "rustc_serialize"
39693969
version = "0.0.0"
39703970
dependencies = [
3971-
"indexmap 1.9.3",
3971+
"indexmap 2.0.0",
39723972
"rustc_macros",
39733973
"smallvec",
39743974
"tempfile",
@@ -4016,7 +4016,7 @@ name = "rustc_span"
40164016
version = "0.0.0"
40174017
dependencies = [
40184018
"cfg-if",
4019-
"indexmap 1.9.3",
4019+
"indexmap 2.0.0",
40204020
"md-5",
40214021
"rustc_arena",
40224022
"rustc_data_structures",

compiler/rustc_data_structures/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ arrayvec = { version = "0.7", default-features = false }
1010
bitflags = "1.2.1"
1111
cfg-if = "1.0"
1212
ena = "0.14.2"
13-
indexmap = { version = "1.9.3" }
13+
indexmap = { version = "2.0.0" }
1414
jobserver_crate = { version = "0.1.13", package = "jobserver" }
1515
libc = "0.2"
1616
measureme = "10.0.0"

compiler/rustc_serialize/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.0.0"
44
edition = "2021"
55

66
[dependencies]
7-
indexmap = "1.9.3"
7+
indexmap = "2.0.0"
88
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
99
thin-vec = "0.2.12"
1010

compiler/rustc_span/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ tracing = "0.1"
1818
sha1 = "0.10.0"
1919
sha2 = "0.10.1"
2020
md5 = { package = "md-5", version = "0.10.0" }
21-
indexmap = { version = "1.9.3" }
21+
indexmap = { version = "2.0.0" }

src/tools/bump-stage0/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2021"
88
[dependencies]
99
anyhow = "1.0.34"
1010
curl = "0.4.38"
11-
indexmap = { version = "1.9.1", features = ["serde"] }
11+
indexmap = { version = "2.0.0", features = ["serde"] }
1212
serde = { version = "1.0.125", features = ["derive"] }
1313
serde_json = { version = "1.0.59", features = ["preserve_order"] }
1414
toml = "0.5.7"

tests/ui-fulldeps/missing-rustc-driver-error.stderr

+2-10
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,7 @@ error: crate `indexmap` required to be available in rlib format, but was not fou
1010

1111
error: crate `hashbrown` required to be available in rlib format, but was not found in this form
1212

13-
error: crate `ahash` required to be available in rlib format, but was not found in this form
13+
error: crate `equivalent` required to be available in rlib format, but was not found in this form
1414

15-
error: crate `once_cell` required to be available in rlib format, but was not found in this form
16-
17-
error: crate `getrandom` required to be available in rlib format, but was not found in this form
18-
19-
error: crate `cfg_if` required to be available in rlib format, but was not found in this form
20-
21-
error: crate `libc` required to be available in rlib format, but was not found in this form
22-
23-
error: aborting due to 10 previous errors
15+
error: aborting due to 6 previous errors
2416

0 commit comments

Comments
 (0)