Skip to content

Commit 02025d8

Browse files
committed
Remove re-export.
1 parent c355b2e commit 02025d8

File tree

31 files changed

+35
-26
lines changed

31 files changed

+35
-26
lines changed

Cargo.lock

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3684,6 +3684,7 @@ dependencies = [
36843684
"rustc_llvm",
36853685
"rustc_metadata",
36863686
"rustc_middle",
3687+
"rustc_query_system",
36873688
"rustc_serialize",
36883689
"rustc_session",
36893690
"rustc_span",
@@ -3717,6 +3718,7 @@ dependencies = [
37173718
"rustc_macros",
37183719
"rustc_metadata",
37193720
"rustc_middle",
3721+
"rustc_query_system",
37203722
"rustc_serialize",
37213723
"rustc_session",
37223724
"rustc_span",
@@ -3744,6 +3746,7 @@ dependencies = [
37443746
"rustc_macros",
37453747
"rustc_middle",
37463748
"rustc_mir_dataflow",
3749+
"rustc_query_system",
37473750
"rustc_session",
37483751
"rustc_span",
37493752
"rustc_target",
@@ -4178,6 +4181,7 @@ dependencies = [
41784181
"rustc_index",
41794182
"rustc_middle",
41804183
"rustc_mir_dataflow",
4184+
"rustc_query_system",
41814185
"rustc_serialize",
41824186
"rustc_session",
41834187
"rustc_span",
@@ -4422,6 +4426,7 @@ dependencies = [
44224426
"rustc_data_structures",
44234427
"rustc_hir",
44244428
"rustc_middle",
4429+
"rustc_query_system",
44254430
"rustc_session",
44264431
"rustc_span",
44274432
"rustc_target",
@@ -4465,6 +4470,7 @@ dependencies = [
44654470
"rustc_macros",
44664471
"rustc_middle",
44674472
"rustc_parse_format",
4473+
"rustc_query_system",
44684474
"rustc_session",
44694475
"rustc_span",
44704476
"rustc_target",

compiler/rustc_codegen_llvm/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ rustc_hir = { path = "../rustc_hir" }
2626
rustc_index = { path = "../rustc_index" }
2727
rustc_llvm = { path = "../rustc_llvm" }
2828
rustc_metadata = { path = "../rustc_metadata" }
29+
rustc_query_system = { path = "../rustc_query_system" }
2930
rustc_session = { path = "../rustc_session" }
3031
rustc_serialize = { path = "../rustc_serialize" }
3132
rustc_target = { path = "../rustc_target" }

compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ use rustc_fs_util::path_to_c_string;
2626
use rustc_hir::def::CtorKind;
2727
use rustc_hir::def_id::{DefId, LOCAL_CRATE};
2828
use rustc_index::vec::{Idx, IndexVec};
29-
use rustc_middle::ich::NodeIdHashingMode;
3029
use rustc_middle::mir::{self, GeneratorLayout};
3130
use rustc_middle::ty::layout::{self, IntegerExt, LayoutOf, PrimitiveExt, TyAndLayout};
3231
use rustc_middle::ty::subst::GenericArgKind;
3332
use rustc_middle::ty::Instance;
3433
use rustc_middle::ty::{self, AdtKind, GeneratorSubsts, ParamEnv, Ty, TyCtxt};
3534
use rustc_middle::{bug, span_bug};
35+
use rustc_query_system::ich::NodeIdHashingMode;
3636
use rustc_session::config::{self, DebugInfo};
3737
use rustc_span::symbol::Symbol;
3838
use rustc_span::FileNameDisplayPreference;

compiler/rustc_codegen_ssa/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ rustc_incremental = { path = "../rustc_incremental" }
3333
rustc_index = { path = "../rustc_index" }
3434
rustc_macros = { path = "../rustc_macros" }
3535
rustc_metadata = { path = "../rustc_metadata" }
36+
rustc_query_system = { path = "../rustc_query_system" }
3637
rustc_target = { path = "../rustc_target" }
3738
rustc_session = { path = "../rustc_session" }
3839

compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
1616
use rustc_hir as hir;
1717
use rustc_hir::def_id::DefId;
1818
use rustc_hir::definitions::{DefPathData, DefPathDataName, DisambiguatedDefPathData};
19-
use rustc_middle::ich::NodeIdHashingMode;
2019
use rustc_middle::ty::layout::IntegerExt;
2120
use rustc_middle::ty::subst::{GenericArgKind, SubstsRef};
2221
use rustc_middle::ty::{self, AdtDef, ExistentialProjection, Ty, TyCtxt};
22+
use rustc_query_system::ich::NodeIdHashingMode;
2323
use rustc_target::abi::{Integer, TagEncoding, Variants};
2424
use smallvec::SmallVec;
2525

compiler/rustc_const_eval/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ rustc_infer = { path = "../rustc_infer" }
2121
rustc_macros = { path = "../rustc_macros" }
2222
rustc_middle = { path = "../rustc_middle" }
2323
rustc_mir_dataflow = { path = "../rustc_mir_dataflow" }
24+
rustc_query_system = { path = "../rustc_query_system" }
2425
rustc_session = { path = "../rustc_session" }
2526
rustc_target = { path = "../rustc_target" }
2627
rustc_trait_selection = { path = "../rustc_trait_selection" }

compiler/rustc_const_eval/src/interpret/eval_context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
66
use rustc_hir::{self as hir, def_id::DefId, definitions::DefPathData};
77
use rustc_index::vec::IndexVec;
88
use rustc_macros::HashStable;
9-
use rustc_middle::ich::StableHashingContext;
109
use rustc_middle::mir;
1110
use rustc_middle::ty::layout::{self, LayoutError, LayoutOf, LayoutOfHelpers, TyAndLayout};
1211
use rustc_middle::ty::{
1312
self, query::TyCtxtAt, subst::SubstsRef, ParamEnv, Ty, TyCtxt, TypeFoldable,
1413
};
1514
use rustc_mir_dataflow::storage::AlwaysLiveLocals;
15+
use rustc_query_system::ich::StableHashingContext;
1616
use rustc_session::Limit;
1717
use rustc_span::{Pos, Span};
1818
use rustc_target::abi::{Align, HasDataLayout, Size, TargetDataLayout};

compiler/rustc_macros/src/hash_stable.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,14 @@ pub fn hash_stable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::To
116116
s.bound_impl(
117117
quote!(
118118
::rustc_data_structures::stable_hasher::HashStable<
119-
::rustc_middle::ich::StableHashingContext<'__ctx>,
119+
::rustc_query_system::ich::StableHashingContext<'__ctx>,
120120
>
121121
),
122122
quote! {
123123
#[inline]
124124
fn hash_stable(
125125
&self,
126-
__hcx: &mut ::rustc_middle::ich::StableHashingContext<'__ctx>,
126+
__hcx: &mut ::rustc_query_system::ich::StableHashingContext<'__ctx>,
127127
__hasher: &mut ::rustc_data_structures::stable_hasher::StableHasher) {
128128
#discriminant
129129
match *self { #body }

compiler/rustc_middle/src/dep_graph/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use crate::ich::StableHashingContext;
21
use crate::ty::{self, TyCtxt};
32
use rustc_data_structures::profiling::SelfProfilerRef;
43
use rustc_data_structures::sync::Lock;
4+
use rustc_query_system::ich::StableHashingContext;
55
use rustc_session::Session;
66

77
#[macro_use]

compiler/rustc_middle/src/hir/map/collector.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use crate::arena::Arena;
22
use crate::hir::map::Map;
33
use crate::hir::{IndexedHir, OwnerNodes, ParentedNode};
4-
use crate::ich::StableHashingContext;
54
use rustc_data_structures::fingerprint::Fingerprint;
65
use rustc_data_structures::fx::FxHashMap;
76
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
@@ -12,6 +11,7 @@ use rustc_hir::definitions;
1211
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
1312
use rustc_hir::*;
1413
use rustc_index::vec::{Idx, IndexVec};
14+
use rustc_query_system::ich::StableHashingContext;
1515
use rustc_session::Session;
1616
use rustc_span::source_map::SourceMap;
1717
use rustc_span::{Span, DUMMY_SP};

0 commit comments

Comments
 (0)