Skip to content

Commit

Permalink
Auto merge of #113304 - cuviper:indexmap-2, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Jul 4, 2023
2 parents 0130c3a + 2b091ff commit 52d8c49
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 20 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"curl",
"indexmap 1.9.3",
"indexmap 2.0.0",
"serde",
"serde_json",
"toml 0.5.11",
Expand Down Expand Up @@ -1694,8 +1694,6 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg",
"hashbrown 0.12.3",
"rustc-rayon",
"serde",
]

[[package]]
Expand All @@ -1706,6 +1704,8 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
dependencies = [
"equivalent",
"hashbrown 0.14.0",
"rustc-rayon",
"serde",
]

[[package]]
Expand Down Expand Up @@ -3190,7 +3190,7 @@ dependencies = [
"cfg-if",
"elsa",
"ena",
"indexmap 1.9.3",
"indexmap 2.0.0",
"itertools",
"jobserver",
"libc",
Expand Down Expand Up @@ -3968,7 +3968,7 @@ dependencies = [
name = "rustc_serialize"
version = "0.0.0"
dependencies = [
"indexmap 1.9.3",
"indexmap 2.0.0",
"rustc_macros",
"smallvec",
"tempfile",
Expand Down Expand Up @@ -4016,7 +4016,7 @@ name = "rustc_span"
version = "0.0.0"
dependencies = [
"cfg-if",
"indexmap 1.9.3",
"indexmap 2.0.0",
"md-5",
"rustc_arena",
"rustc_data_structures",
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_data_structures/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ arrayvec = { version = "0.7", default-features = false }
bitflags = "1.2.1"
cfg-if = "1.0"
ena = "0.14.2"
indexmap = { version = "1.9.3" }
indexmap = { version = "2.0.0" }
jobserver_crate = { version = "0.1.13", package = "jobserver" }
libc = "0.2"
measureme = "10.0.0"
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_serialize/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
edition = "2021"

[dependencies]
indexmap = "1.9.3"
indexmap = "2.0.0"
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
thin-vec = "0.2.12"

Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_span/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ tracing = "0.1"
sha1 = "0.10.0"
sha2 = "0.10.1"
md5 = { package = "md-5", version = "0.10.0" }
indexmap = { version = "1.9.3" }
indexmap = { version = "2.0.0" }
2 changes: 1 addition & 1 deletion src/tools/bump-stage0/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2021"
[dependencies]
anyhow = "1.0.34"
curl = "0.4.38"
indexmap = { version = "1.9.1", features = ["serde"] }
indexmap = { version = "2.0.0", features = ["serde"] }
serde = { version = "1.0.125", features = ["derive"] }
serde_json = { version = "1.0.59", features = ["preserve_order"] }
toml = "0.5.7"
12 changes: 2 additions & 10 deletions tests/ui-fulldeps/missing-rustc-driver-error.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,7 @@ error: crate `indexmap` required to be available in rlib format, but was not fou

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

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

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

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

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

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

error: aborting due to 10 previous errors
error: aborting due to 6 previous errors

0 comments on commit 52d8c49

Please sign in to comment.