about summary refs log tree commit diff
path: root/src/librustc_codegen_llvm/base.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-03-19 00:28:33 +0000
committerbors <bors@rust-lang.org>2020-03-19 00:28:33 +0000
commit57e1da59cd0761330b4ea8d47b16340a78eeafa9 (patch)
tree0dc41b23dbe3fda1dbc8e69548e7060adcea0fd1 /src/librustc_codegen_llvm/base.rs
parentf509b26a7730d721ef87423a72b3fdf8724b4afa (diff)
parent94ed0719f7ab083e4c94651a608ae49e14653e6a (diff)
downloadrust-57e1da59cd0761330b4ea8d47b16340a78eeafa9.tar.gz
rust-57e1da59cd0761330b4ea8d47b16340a78eeafa9.zip
Auto merge of #70118 - pietroalbini:rollup-pgjc90i, r=pietroalbini
Rollup of 2 pull requests

Successful merges:

 - #70112 (Rollup of 10 pull requests)
 - #70116 (ci: use python from the correct path)

Failed merges:

r? @ghost
Diffstat (limited to 'src/librustc_codegen_llvm/base.rs')
-rw-r--r--src/librustc_codegen_llvm/base.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_llvm/base.rs b/src/librustc_codegen_llvm/base.rs
index 04c084e459e..0d063d82c69 100644
--- a/src/librustc_codegen_llvm/base.rs
+++ b/src/librustc_codegen_llvm/base.rs
@@ -28,13 +28,13 @@ use rustc::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
 use rustc::middle::cstore::EncodedMetadata;
 use rustc::middle::exported_symbols;
 use rustc::mir::mono::{Linkage, Visibility};
-use rustc::session::config::DebugInfo;
 use rustc::ty::TyCtxt;
 use rustc_codegen_ssa::base::maybe_create_entry_wrapper;
 use rustc_codegen_ssa::mono_item::MonoItemExt;
 use rustc_codegen_ssa::traits::*;
 use rustc_codegen_ssa::{ModuleCodegen, ModuleKind};
 use rustc_data_structures::small_c_str::SmallCStr;
+use rustc_session::config::DebugInfo;
 use rustc_span::symbol::Symbol;
 
 use std::ffi::CString;