diff options
| author | bors <bors@rust-lang.org> | 2020-03-19 00:28:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-19 00:28:33 +0000 |
| commit | 57e1da59cd0761330b4ea8d47b16340a78eeafa9 (patch) | |
| tree | 0dc41b23dbe3fda1dbc8e69548e7060adcea0fd1 /src/librustc_codegen_llvm/attributes.rs | |
| parent | f509b26a7730d721ef87423a72b3fdf8724b4afa (diff) | |
| parent | 94ed0719f7ab083e4c94651a608ae49e14653e6a (diff) | |
| download | rust-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/attributes.rs')
| -rw-r--r-- | src/librustc_codegen_llvm/attributes.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/attributes.rs b/src/librustc_codegen_llvm/attributes.rs index a9e4fdba030..072607fff85 100644 --- a/src/librustc_codegen_llvm/attributes.rs +++ b/src/librustc_codegen_llvm/attributes.rs @@ -3,8 +3,6 @@ use std::ffi::CString; use rustc::middle::codegen_fn_attrs::CodegenFnAttrFlags; -use rustc::session::config::{OptLevel, Sanitizer}; -use rustc::session::Session; use rustc::ty::layout::HasTyCtxt; use rustc::ty::query::Providers; use rustc::ty::{self, Ty, TyCtxt}; @@ -13,6 +11,8 @@ use rustc_data_structures::const_cstr; use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::small_c_str::SmallCStr; use rustc_hir::def_id::{DefId, LOCAL_CRATE}; +use rustc_session::config::{OptLevel, Sanitizer}; +use rustc_session::Session; use rustc_target::abi::call::Conv; use rustc_target::spec::PanicStrategy; |