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_codegen_llvm/src/back/archive.rs | |
| 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_codegen_llvm/src/back/archive.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/archive.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/archive.rs b/compiler/rustc_codegen_llvm/src/back/archive.rs index 4e86946219f..ebc3b704158 100644 --- a/compiler/rustc_codegen_llvm/src/back/archive.rs +++ b/compiler/rustc_codegen_llvm/src/back/archive.rs @@ -11,7 +11,7 @@ use crate::llvm::archive_ro::{ArchiveRO, Child}; use crate::llvm::{self, ArchiveKind, LLVMMachineType, LLVMRustCOFFShortExport}; use rustc_codegen_ssa::back::archive::ArchiveBuilder; use rustc_data_structures::temp_dir::MaybeTempDir; -use rustc_middle::middle::cstore::{DllCallingConvention, DllImport}; +use rustc_session::cstore::{DllCallingConvention, DllImport}; use rustc_session::Session; struct ArchiveConfig<'a> { |