Update rustc-hash to version 2

This brings in the new optimized algorithm that was shown to have small performance benefits for
rustc.

Author: Noratrieb

src/tools/rust-analyzer/Cargo.lock

@@ -73,7 +73,7 @@ dependencies = [
 "intern",
 "la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "lz4_flex",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "salsa",
 "semver",
 "span",
@@ -161,7 +161,7 @@ dependencies = [
 "expect-test",
 "intern",
 "oorandom",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "syntax",
 "syntax-bridge",
 "tt",
@@ -216,7 +216,7 @@ dependencies = [
 "chalk-derive",
 "chalk-ir",
 "chalk-solve",
-"rustc-hash",
+"rustc-hash 1.1.0",
 "tracing",
 ]
 
@@ -232,7 +232,7 @@ dependencies = [
 "indexmap",
 "itertools",
 "petgraph",
-"rustc-hash",
+"rustc-hash 1.1.0",
 "tracing",
 ]
 
@@ -513,7 +513,7 @@ dependencies = [
 "hir-ty",
 "intern",
 "itertools",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "smallvec",
 "span",
 "stdx",
@@ -547,7 +547,7 @@ dependencies = [
 "mbe",
 "ra-ap-rustc_abi",
 "ra-ap-rustc_parse_format",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "rustc_apfloat",
 "smallvec",
 "span",
@@ -577,7 +577,7 @@ dependencies = [
 "limit",
 "mbe",
 "parser",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "smallvec",
 "span",
 "stdx",
@@ -616,7 +616,7 @@ dependencies = [
 "ra-ap-rustc_abi",
 "ra-ap-rustc_index",
 "ra-ap-rustc_pattern_analysis",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "rustc_apfloat",
 "scoped-tls",
 "smallvec",
@@ -737,7 +737,7 @@ dependencies = [
 "parser",
 "profile",
 "rayon",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "span",
 "stdx",
 "syntax",
@@ -834,7 +834,7 @@ version = "0.0.0"
 dependencies = [
 "dashmap",
 "hashbrown",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "sptr",
 "triomphe",
 ]
@@ -1051,7 +1051,7 @@ dependencies = [
 "intern",
 "parser",
 "ra-ap-rustc_lexer",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "smallvec",
 "span",
 "stdx",
@@ -1345,7 +1345,7 @@ dependencies = [
 "indexmap",
 "intern",
 "paths",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "serde",
 "serde_json",
 "span",
@@ -1435,7 +1435,7 @@ dependencies = [
 "itertools",
 "la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "paths",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "semver",
 "serde",
 "serde_json",
@@ -1555,7 +1555,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "273d5f72926a58c7eea27aebc898d1d5b32d23d2342f692a94a2cf8746aa4a2f"
 dependencies = [
 "ra-ap-rustc_index",
-"rustc-hash",
+"rustc-hash 1.1.0",
 "rustc_apfloat",
 "smallvec",
 "tracing",
@@ -1640,7 +1640,7 @@ dependencies = [
 "countme",
 "hashbrown",
 "memoffset",
-"rustc-hash",
+"rustc-hash 1.1.0",
 "text-size",
 ]
 
@@ -1680,7 +1680,7 @@ dependencies = [
 "profile",
 "project-model",
 "rayon",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "scip",
 "semver",
 "serde",
@@ -1717,6 +1717,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
+[[package]]
+name = "rustc-hash"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+
 [[package]]
 name = "rustc_apfloat"
 version = "0.2.1+llvm-462a31f5a5ab"
@@ -1746,7 +1752,7 @@ dependencies = [
 "oorandom",
 "parking_lot",
 "rand",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "salsa-macros",
 "smallvec",
 "tracing",
@@ -1898,7 +1904,7 @@ version = "0.0.0"
 dependencies = [
 "hashbrown",
 "la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "salsa",
 "stdx",
 "syntax",
@@ -1967,7 +1973,7 @@ dependencies = [
 "ra-ap-rustc_lexer",
 "rayon",
 "rowan",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "rustc_apfloat",
 "smol_str",
 "stdx",
@@ -1983,7 +1989,7 @@ version = "0.0.0"
 dependencies = [
 "intern",
 "parser",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "span",
 "stdx",
 "syntax",
@@ -2000,7 +2006,7 @@ dependencies = [
 "cfg",
 "hir-expand",
 "intern",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "span",
 "stdx",
 "test-utils",
@@ -2014,7 +2020,7 @@ dependencies = [
 "dissimilar",
 "paths",
 "profile",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "stdx",
 "text-size",
 "tracing",
@@ -2361,7 +2367,7 @@ dependencies = [
 "indexmap",
 "nohash-hasher",
 "paths",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "stdx",
 "tracing",
 ]
@@ -2374,7 +2380,7 @@ dependencies = [
 "notify",
 "paths",
 "rayon",
-"rustc-hash",
+"rustc-hash 2.0.0",
 "stdx",
 "tracing",
 "vfs",

src/tools/rust-analyzer/Cargo.toml

@@ -136,7 +136,7 @@ process-wrap = { version = "8.0.2", features = ["std"] }
 pulldown-cmark-to-cmark = "10.0.4"
 pulldown-cmark = { version = "0.9.0", default-features = false }
 rayon = "1.8.0"
-rustc-hash = "1.1.0"
+rustc-hash = "2.0.0"
 semver = "1.0.14"
 serde = { version = "1.0.192", features = ["derive"] }
 serde_json = "1.0.108"

src/tools/rust-analyzer/crates/hir-ty/src/lib.rs

@@ -51,10 +51,7 @@ mod test_db;
 #[cfg(test)]
 mod tests;
 
-use std::{
- collections::hash_map::Entry,
- hash::{BuildHasherDefault,Hash},
-};
+use std::{collections::hash_map::Entry, hash::Hash};
 
 use base_db::ra_salsa::InternValueTrivial;
 use chalk_ir::{
@@ -245,7 +242,7 @@ impl MemoryMap {
 matchself{
 MemoryMap::Empty => Ok(Default::default()),
 MemoryMap::Simple(m) => transform((&0, m)).map(|(addr, val)| {
-letmut map = FxHashMap::with_capacity_and_hasher(1,BuildHasherDefault::default());
+letmut map = FxHashMap::with_capacity_and_hasher(1,rustc_hash::FxBuildHasher);
  map.insert(addr, val);
  map
 }),

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

@@ -17,7 +17,7 @@ indexmap = "2.1.0"
 lock_api = "0.4"
 tracing = "0.1"
 parking_lot = "0.12.1"
-rustc-hash = "1.0"
+rustc-hash = "2.0.0"
 smallvec = "1.0.0"
 oorandom = "11"
 triomphe = "0.1.11"