Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b388e29

Browse files
committedSep 24, 2023
Use sysroot hashbrown
1 parent 7321ae5 commit b388e29

File tree

6 files changed

+5
-13
lines changed

6 files changed

+5
-13
lines changed
 

‎Cargo.lock

-2
Original file line numberDiff line numberDiff line change
@@ -3621,7 +3621,6 @@ dependencies = [
36213621
"cfg-if",
36223622
"elsa",
36233623
"ena",
3624-
"hashbrown 0.14.0",
36253624
"indexmap 2.0.0",
36263625
"itertools",
36273626
"jobserver",
@@ -4350,7 +4349,6 @@ dependencies = [
43504349
name = "rustc_query_system"
43514350
version = "0.0.0"
43524351
dependencies = [
4353-
"hashbrown 0.14.0",
43544352
"parking_lot 0.12.1",
43554353
"rustc-hash",
43564354
"rustc-rayon-core",

‎compiler/rustc_data_structures/Cargo.toml

-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ indexmap = { version = "2.0.0" }
1414
jobserver_crate = { version = "0.1.13", package = "jobserver" }
1515
libc = "0.2"
1616
measureme = "10.0.0"
17-
hashbrown = { version = "0.14", default-features = false, features = [
18-
"raw",
19-
"inline-more",
20-
"nightly",
21-
] }
2217
rustc-rayon-core = { version = "0.5.0", optional = true }
2318
rustc-rayon = { version = "0.5.0", optional = true }
2419
rustc_arena = { path = "../rustc_arena" }

‎compiler/rustc_data_structures/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ extern crate cfg_if;
4747
#[macro_use]
4848
extern crate rustc_macros;
4949

50+
extern crate hashbrown;
51+
5052
use std::fmt;
5153

5254
pub use rustc_index::static_assert_size;

‎compiler/rustc_query_system/Cargo.toml

-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ edition = "2021"
66
[lib]
77

88
[dependencies]
9-
hashbrown = { version = "0.14", default-features = false, features = [
10-
"raw",
11-
"inline-more",
12-
"nightly",
13-
] }
149
parking_lot = "0.12"
1510
rustc-hash = "1.1.0"
1611
rustc_ast = { path = "../rustc_ast" }

‎compiler/rustc_query_system/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ extern crate rustc_data_structures;
1616
#[macro_use]
1717
extern crate rustc_macros;
1818

19+
extern crate hashbrown;
20+
1921
use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage};
2022
use rustc_fluent_macro::fluent_messages;
2123

‎library/std/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ libc = { version = "0.2.148", default-features = false, features = ['rustc-dep-o
2121
compiler_builtins = { version = "0.1.100" }
2222
profiler_builtins = { path = "../profiler_builtins", optional = true }
2323
unwind = { path = "../unwind" }
24-
hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep-of-std'] }
24+
hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep-of-std', 'raw'] }
2525
std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = ['rustc-dep-of-std'] }
2626

2727
# Dependencies of the `backtrace` crate

0 commit comments

Comments
 (0)
Failed to load comments.