about summary refs log tree commit diff
path: root/src/librustc_codegen_llvm/context.rs
diff options
context:
space:
mode:
authorSaleem Jaffer <ssaleem1992@gmail.com>2019-04-24 20:29:46 +0530
committerSaleem Jaffer <ssaleem1992@gmail.com>2019-05-04 15:17:26 +0530
commit199ff02dacae8a00902bbd2bca3ec65652444598 (patch)
tree167fe3dcc8c3b5f2a3dd91ab86b9d60f5ea82214 /src/librustc_codegen_llvm/context.rs
parent82410e800f864684ec5009ea0cecd9614155ca06 (diff)
downloadrust-199ff02dacae8a00902bbd2bca3ec65652444598.tar.gz
rust-199ff02dacae8a00902bbd2bca3ec65652444598.zip
resolving conflicts
Diffstat (limited to 'src/librustc_codegen_llvm/context.rs')
-rw-r--r--src/librustc_codegen_llvm/context.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/librustc_codegen_llvm/context.rs b/src/librustc_codegen_llvm/context.rs
index 55b28682725..7cf78a41feb 100644
--- a/src/librustc_codegen_llvm/context.rs
+++ b/src/librustc_codegen_llvm/context.rs
@@ -8,7 +8,6 @@ use rustc::hir;
 
 use crate::monomorphize::partitioning::CodegenUnit;
 use crate::type_::Type;
-use crate::type_of::PointeeInfo;
 use rustc_codegen_ssa::traits::*;
 
 use rustc_data_structures::base_n;