user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolving conflicts

Browse source
This commit is contained in:
Saleem Jaffer 2019-04-24 20:29:46 +05:30
parent 82410e800f
commit 199ff02dac
4 changed files with 24 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustc_codegen_llvm/abi.rs
View file

@ -2,17 +2,11 @@ use crate::llvm::{self, AttributePlace};
use crate::builder::Builder;
use crate::context::CodegenCx;
use crate::type_::Type;
use crate::type_of::{LayoutLlvmExt, PointerKind};
use crate::value::Value;
use crate::type_of::{LayoutLlvmExt};
use rustc_codegen_ssa::MemFlags;
use rustc_codegen_ssa::mir::place::PlaceRef;
use rustc_codegen_ssa::mir::operand::OperandValue;
<<<<<<< HEAD
=======
use type_::Type;
use type_of::{LayoutLlvmExt};
use value::Value;
>>>>>>> Remove old pointee_info_at body.
use rustc_target::abi::call::ArgType;
use rustc_codegen_ssa::traits::*;

1
src/librustc_codegen_llvm/context.rs
View file

@ -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;

3
src/librustc_codegen_llvm/type_of.rs
View file

@ -1,9 +1,6 @@
use crate::abi::{FnType, FnTypeExt};
use crate::common::*;
use crate::type_::Type;
use rustc::hir;
use abi::{FnType, FnTypeExt};
use common::*;
use rustc::ty::{self, Ty, TypeFoldable};
use rustc::ty::layout::{self, Align, LayoutOf, PointeeInfo, Size, TyLayout};
use rustc_target::abi::{FloatTy, TyLayoutMethods};