Skip to content

Commit b0fe3f1

Browse files
committed
Use version 2.2.0 to work around duplicate version issue.
1 parent 3a6da61 commit b0fe3f1

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

Cargo.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1982,7 +1982,7 @@ dependencies = [
19821982
"anyhow",
19831983
"clap",
19841984
"fs-err",
1985-
"rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)",
1985+
"rustc-hash 2.2.0",
19861986
"rustdoc-json-types",
19871987
"serde",
19881988
"serde_json",
@@ -3151,7 +3151,7 @@ dependencies = [
31513151
"proc-macro2",
31523152
"quote",
31533153
"rinja_parser",
3154-
"rustc-hash 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
3154+
"rustc-hash 2.1.0",
31553155
"serde",
31563156
"syn 2.0.96",
31573157
]
@@ -3221,8 +3221,8 @@ checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
32213221

32223222
[[package]]
32233223
name = "rustc-hash"
3224-
version = "2.1.0"
3225-
source = "git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663#3a89863922cb4ba5237a5bef65a9535b3d598663"
3224+
version = "2.2.0"
3225+
source = "git+https://github.com/orlp/rustc-hash?rev=2ccde1ec8a948b5463011d3c7363c273fc2bb80e#2ccde1ec8a948b5463011d3c7363c273fc2bb80e"
32263226

32273227
[[package]]
32283228
name = "rustc-main"
@@ -3626,7 +3626,7 @@ dependencies = [
36263626
"memmap2",
36273627
"parking_lot",
36283628
"portable-atomic",
3629-
"rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)",
3629+
"rustc-hash 2.2.0",
36303630
"rustc-rayon",
36313631
"rustc-stable-hash",
36323632
"rustc_arena",
@@ -4329,7 +4329,7 @@ dependencies = [
43294329
name = "rustc_pattern_analysis"
43304330
version = "0.0.0"
43314331
dependencies = [
4332-
"rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)",
4332+
"rustc-hash 2.2.0",
43334333
"rustc_abi",
43344334
"rustc_apfloat",
43354335
"rustc_arena",
@@ -4652,7 +4652,7 @@ dependencies = [
46524652
"bitflags",
46534653
"derive-where",
46544654
"indexmap",
4655-
"rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)",
4655+
"rustc-hash 2.2.0",
46564656
"rustc_ast_ir",
46574657
"rustc_data_structures",
46584658
"rustc_index",
@@ -4725,7 +4725,7 @@ name = "rustdoc-json-types"
47254725
version = "0.1.0"
47264726
dependencies = [
47274727
"bincode",
4728-
"rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)",
4728+
"rustc-hash 2.2.0",
47294729
"serde",
47304730
"serde_json",
47314731
]
@@ -5376,7 +5376,7 @@ dependencies = [
53765376
"ignore",
53775377
"miropt-test-tools",
53785378
"regex",
5379-
"rustc-hash 2.1.0 (git+https://github.com/orlp/rustc-hash?rev=3a89863922cb4ba5237a5bef65a9535b3d598663)",
5379+
"rustc-hash 2.2.0",
53805380
"semver",
53815381
"similar",
53825382
"termcolor",

compiler/rustc_data_structures/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ena = "0.14.3"
1313
indexmap = { version = "2.4.0", features = ["rustc-rayon"] }
1414
jobserver_crate = { version = "0.1.28", package = "jobserver" }
1515
measureme = "11"
16-
rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" }
16+
rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "2ccde1ec8a948b5463011d3c7363c273fc2bb80e" }
1717
rustc-rayon = "0.5.0"
1818
rustc-stable-hash = { version = "0.1.0", features = ["nightly"] }
1919
rustc_arena = { path = "../rustc_arena" }

compiler/rustc_pattern_analysis/Cargo.toml

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

66
[dependencies]
77
# tidy-alphabetical-start
8-
rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" }
8+
rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "2ccde1ec8a948b5463011d3c7363c273fc2bb80e" }
99

1010
rustc_abi = { path = "../rustc_abi", optional = true }
1111
rustc_apfloat = "0.2.0"

compiler/rustc_type_ir/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2021"
88
bitflags = "2.4.1"
99
derive-where = "1.2.7"
1010
indexmap = "2.0.0"
11-
rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" }
11+
rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "2ccde1ec8a948b5463011d3c7363c273fc2bb80e" }
1212
rustc_ast_ir = { path = "../rustc_ast_ir", default-features = false }
1313
rustc_data_structures = { path = "../rustc_data_structures", optional = true }
1414
rustc_index = { path = "../rustc_index", default-features = false }

src/rustdoc-json-types/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ default = ["rustc-hash"]
1111

1212
[dependencies]
1313
serde = { version = "1.0", features = ["derive"] }
14-
rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663", optional=true }
14+
rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "2ccde1ec8a948b5463011d3c7363c273fc2bb80e", optional=true }
1515

1616
[dev-dependencies]
1717
serde_json = "1.0"

src/tools/jsondoclint/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ edition = "2021"
99
anyhow = "1.0.62"
1010
clap = { version = "4.0.15", features = ["derive"] }
1111
fs-err = "2.8.1"
12-
rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" }
12+
rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "2ccde1ec8a948b5463011d3c7363c273fc2bb80e" }
1313
rustdoc-json-types = { version = "0.1.0", path = "../../rustdoc-json-types" }
1414
serde = { version = "1.0", features = ["derive"] }
1515
serde_json = "1.0.85"

src/tools/rust-analyzer/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ process-wrap = { version = "8.0.2", features = ["std"] }
136136
pulldown-cmark-to-cmark = "10.0.4"
137137
pulldown-cmark = { version = "0.9.0", default-features = false }
138138
rayon = "1.8.0"
139-
rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" }
139+
rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "2ccde1ec8a948b5463011d3c7363c273fc2bb80e" }
140140
semver = "1.0.14"
141141
serde = { version = "1.0.192" }
142142
serde_derive = { version = "1.0.192" }

src/tools/rust-analyzer/crates/ra-salsa/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ indexmap = "2.1.0"
1717
lock_api = "0.4"
1818
tracing = "0.1"
1919
parking_lot = "0.12.1"
20-
rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" }
20+
rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "2ccde1ec8a948b5463011d3c7363c273fc2bb80e" }
2121
smallvec = "1.0.0"
2222
oorandom = "11"
2323
triomphe.workspace = true

src/tools/tidy/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ walkdir = "2"
1313
ignore = "0.4.18"
1414
semver = "1.0"
1515
termcolor = "1.1.3"
16-
rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "3a89863922cb4ba5237a5bef65a9535b3d598663" }
16+
rustc-hash = { git = "https://github.com/orlp/rustc-hash", rev = "2ccde1ec8a948b5463011d3c7363c273fc2bb80e" }
1717
fluent-syntax = "0.11.1"
1818
similar = "2.5.0"
1919

0 commit comments

Comments
 (0)