squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Fix rebase errors.

Browse source
This commit is contained in:
Mark Simulacrum 2016-12-20 20:37:19 -07:00
parent 079abd0b1e
commit 0013d4cdf6
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/librustc_trans/mir/mod.rs
View file

@ -11,7 +11,7 @@
use libc::c_uint;
use llvm::{self, ValueRef, BasicBlockRef};
use llvm::debuginfo::DIScope;
use rustc::ty;
use rustc::ty::{self, layout};
use rustc::mir::{self, Mir};
use rustc::mir::tcx::LvalueTy;
use rustc::ty::subst::Substs;
@ -23,7 +23,6 @@ use common::{self, BlockAndBuilder, CrateContext, FunctionContext, C_null, Funcl
use debuginfo::{self, declare_local, VariableAccess, VariableKind, FunctionDebugContext};
use monomorphize::{self, Instance};
use abi::FnType;
use machine;
use type_of;
use syntax_pos::{DUMMY_SP, NO_EXPANSION, COMMAND_LINE_EXPN, BytePos, Span};