Skip to content

Commit 038c183

Browse files
compiler: remove rustc_target reexport of rustc_abi::HashStableContext
The last public reexport of rustc_abi in rustc_target is finally gone.
1 parent d9c7abb commit 038c183

File tree

6 files changed

+5
-9
lines changed

6 files changed

+5
-9
lines changed

Cargo.lock

+1-2
Original file line numberDiff line numberDiff line change
@@ -3409,7 +3409,6 @@ dependencies = [
34093409
"rustc_parse",
34103410
"rustc_session",
34113411
"rustc_span",
3412-
"rustc_target",
34133412
"thin-vec",
34143413
]
34153414

@@ -4423,6 +4422,7 @@ version = "0.0.0"
44234422
dependencies = [
44244423
"parking_lot",
44254424
"rustc-rayon-core",
4425+
"rustc_abi",
44264426
"rustc_ast",
44274427
"rustc_data_structures",
44284428
"rustc_errors",
@@ -4434,7 +4434,6 @@ dependencies = [
44344434
"rustc_serialize",
44354435
"rustc_session",
44364436
"rustc_span",
4437-
"rustc_target",
44384437
"smallvec",
44394438
"thin-vec",
44404439
"tracing",

compiler/rustc_ast_passes/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@ rustc_macros = { path = "../rustc_macros" }
1818
rustc_parse = { path = "../rustc_parse" }
1919
rustc_session = { path = "../rustc_session" }
2020
rustc_span = { path = "../rustc_span" }
21-
rustc_target = { path = "../rustc_target" }
2221
thin-vec = "0.2.12"
2322
# tidy-alphabetical-end

compiler/rustc_hir/src/stable_hash_impls.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ use crate::hir_id::{HirId, ItemLocalId};
1010
/// Requirements for a `StableHashingContext` to be used in this crate.
1111
/// This is a hack to allow using the `HashStable_Generic` derive macro
1212
/// instead of implementing everything in `rustc_middle`.
13-
pub trait HashStableContext:
14-
rustc_ast::HashStableContext + rustc_target::HashStableContext
15-
{
13+
pub trait HashStableContext: rustc_ast::HashStableContext + rustc_abi::HashStableContext {
1614
fn hash_attr(&mut self, _: &Attribute, hasher: &mut StableHasher);
1715
}
1816

compiler/rustc_query_system/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ edition = "2021"
77
# tidy-alphabetical-start
88
parking_lot = "0.12"
99
rustc-rayon-core = { version = "0.5.0" }
10+
rustc_abi = { path = "../rustc_abi" }
1011
rustc_ast = { path = "../rustc_ast" }
1112
rustc_data_structures = { path = "../rustc_data_structures" }
1213
rustc_errors = { path = "../rustc_errors" }
@@ -18,7 +19,6 @@ rustc_macros = { path = "../rustc_macros" }
1819
rustc_serialize = { path = "../rustc_serialize" }
1920
rustc_session = { path = "../rustc_session" }
2021
rustc_span = { path = "../rustc_span" }
21-
rustc_target = { path = "../rustc_target" }
2222
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
2323
thin-vec = "0.2.12"
2424
tracing = "0.1"

compiler/rustc_query_system/src/ich/impls_syntax.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use smallvec::SmallVec;
88

99
use crate::ich::StableHashingContext;
1010

11-
impl<'ctx> rustc_target::HashStableContext for StableHashingContext<'ctx> {}
11+
impl<'ctx> rustc_abi::HashStableContext for StableHashingContext<'ctx> {}
1212
impl<'ctx> rustc_ast::HashStableContext for StableHashingContext<'ctx> {}
1313

1414
impl<'a> HashStable<StableHashingContext<'a>> for [hir::Attribute] {

compiler/rustc_target/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub mod target_features;
3030
#[cfg(test)]
3131
mod tests;
3232

33-
pub use rustc_abi::HashStableContext;
33+
use rustc_abi::HashStableContext;
3434

3535
/// The name of rustc's own place to organize libraries.
3636
///

0 commit comments

Comments
 (0)