diff options
| author | bors <bors@rust-lang.org> | 2020-01-06 12:55:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-06 12:55:40 +0000 |
| commit | ebbb2bf37aedaaa64dfaa52ba337ca6efb6b9093 (patch) | |
| tree | b2f80431c23470654d440694c3b5196bd40f0376 /src/librustc_codegen_llvm/context.rs | |
| parent | a80e63f3fa77792e848e3b248acf4c0acda2e310 (diff) | |
| parent | 01563682c69867984525c255a3232eba9859cff5 (diff) | |
| download | rust-ebbb2bf37aedaaa64dfaa52ba337ca6efb6b9093.tar.gz rust-ebbb2bf37aedaaa64dfaa52ba337ca6efb6b9093.zip | |
Auto merge of #67886 - Centril:rustc_hir_canon_imports, r=nagisa
Nix `rustc_hir` reexports in rustc::hir r? @Zoxc cc @Mark-Simulacrum
Diffstat (limited to 'src/librustc_codegen_llvm/context.rs')
| -rw-r--r-- | src/librustc_codegen_llvm/context.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/context.rs b/src/librustc_codegen_llvm/context.rs index 746b76ad1c7..f07601ed383 100644 --- a/src/librustc_codegen_llvm/context.rs +++ b/src/librustc_codegen_llvm/context.rs @@ -5,7 +5,6 @@ use crate::llvm; use crate::llvm_util; use crate::value::Value; use rustc::dep_graph::DepGraphSafe; -use rustc::hir; use crate::type_::Type; use rustc_codegen_ssa::traits::*; @@ -24,6 +23,7 @@ use rustc_data_structures::base_n; use rustc_data_structures::const_cstr; use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::small_c_str::SmallCStr; +use rustc_hir::Unsafety; use rustc_target::spec::{HasTargetSpec, Target}; use crate::abi::Abi; @@ -415,7 +415,7 @@ impl MiscMethods<'tcx> for CodegenCx<'ll, 'tcx> { iter::once(tcx.mk_mut_ptr(tcx.types.u8)), tcx.types.never, false, - hir::Unsafety::Unsafe, + Unsafety::Unsafe, Abi::C, )); |
