Use sysroot hashbrown

rust-lang · Sep 24, 2023 · b388e29 · b388e29
1 parent 7321ae5
commit b388e29
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -3621,7 +3621,6 @@ dependencies = [
  "cfg-if",
  "elsa",
  "ena",
- "hashbrown 0.14.0",
  "indexmap 2.0.0",
  "itertools",
  "jobserver",
@@ -4350,7 +4349,6 @@ dependencies = [
 name = "rustc_query_system"
 version = "0.0.0"
 dependencies = [
- "hashbrown 0.14.0",
  "parking_lot 0.12.1",
  "rustc-hash",
  "rustc-rayon-core",

diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml
@@ -14,11 +14,6 @@ indexmap = { version = "2.0.0" }
 jobserver_crate = { version = "0.1.13", package = "jobserver" }
 libc = "0.2"
 measureme = "10.0.0"
-hashbrown = { version = "0.14", default-features = false, features = [
-    "raw",
-    "inline-more",
-    "nightly",
-] }
 rustc-rayon-core = { version = "0.5.0", optional = true }
 rustc-rayon = { version = "0.5.0", optional = true }
 rustc_arena = { path = "../rustc_arena" }

diff --git a/compiler/rustc_data_structures/src/lib.rs b/compiler/rustc_data_structures/src/lib.rs
@@ -47,6 +47,8 @@ extern crate cfg_if;
 #[macro_use]
 extern crate rustc_macros;
 
+extern crate hashbrown;
+
 use std::fmt;
 
 pub use rustc_index::static_assert_size;

diff --git a/compiler/rustc_query_system/Cargo.toml b/compiler/rustc_query_system/Cargo.toml
@@ -6,11 +6,6 @@ edition = "2021"
 [lib]
 
 [dependencies]
-hashbrown = { version = "0.14", default-features = false, features = [
-    "raw",
-    "inline-more",
-    "nightly",
-] }
 parking_lot = "0.12"
 rustc-hash = "1.1.0"
 rustc_ast = { path = "../rustc_ast" }

diff --git a/compiler/rustc_query_system/src/lib.rs b/compiler/rustc_query_system/src/lib.rs
@@ -16,6 +16,8 @@ extern crate rustc_data_structures;
 #[macro_use]
 extern crate rustc_macros;
 
+extern crate hashbrown;
+
 use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage};
 use rustc_fluent_macro::fluent_messages;
 

diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
@@ -21,7 +21,7 @@ libc = { version = "0.2.148", default-features = false, features = ['rustc-dep-o
 compiler_builtins = { version = "0.1.100" }
 profiler_builtins = { path = "../profiler_builtins", optional = true }
 unwind = { path = "../unwind" }
-hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep-of-std'] }
+hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep-of-std', 'raw'] }
 std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = ['rustc-dep-of-std'] }
 
 # Dependencies of the `backtrace` crate