resolving conflicts

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

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;