diff options
| author | bors <bors@rust-lang.org> | 2021-10-05 09:45:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-10-05 09:45:11 +0000 |
| commit | 55111d656f7ecd511ebfad09d3b4b41e44cbcc23 (patch) | |
| tree | 7180fe809f15e8c4a5aaed8e0ca3e3e1fa355955 /compiler/rustc_macros/src | |
| parent | 074f63648bd2368d5ca19aed02b5763a144e5d05 (diff) | |
| parent | b2ed9c4007767f6cf692229cffd471d4ce5fde55 (diff) | |
| download | rust-55111d656f7ecd511ebfad09d3b4b41e44cbcc23.tar.gz rust-55111d656f7ecd511ebfad09d3b4b41e44cbcc23.zip | |
Auto merge of #89266 - cjgillot:session-ich, r=michaelwoerister
Move ICH to rustc_query_system Based on https://github.com/rust-lang/rust/pull/89183 The StableHashingContext does not need to be in rustc_middle. This PR moves it to rustc_query_system. This will avoid a dependency between rustc_ast_lowering and rustc_middle in https://github.com/rust-lang/rust/pull/89124.
Diffstat (limited to 'compiler/rustc_macros/src')
| -rw-r--r-- | compiler/rustc_macros/src/hash_stable.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_macros/src/hash_stable.rs b/compiler/rustc_macros/src/hash_stable.rs index b916113a0e5..dba885a27fe 100644 --- a/compiler/rustc_macros/src/hash_stable.rs +++ b/compiler/rustc_macros/src/hash_stable.rs @@ -116,14 +116,14 @@ pub fn hash_stable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::To s.bound_impl( quote!( ::rustc_data_structures::stable_hasher::HashStable< - ::rustc_middle::ich::StableHashingContext<'__ctx>, + ::rustc_query_system::ich::StableHashingContext<'__ctx>, > ), quote! { #[inline] fn hash_stable( &self, - __hcx: &mut ::rustc_middle::ich::StableHashingContext<'__ctx>, + __hcx: &mut ::rustc_query_system::ich::StableHashingContext<'__ctx>, __hasher: &mut ::rustc_data_structures::stable_hasher::StableHasher) { #discriminant match *self { #body } |