Skip to content

Commit

Permalink
Rebase fallout
Browse files Browse the repository at this point in the history
  • Loading branch information
oli-obk committed Nov 8, 2018
1 parent 5d58a03 commit 428af73
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/librustc/mir/interpret/pointer.rs
@@ -1,4 +1,4 @@
use mir;
use mir;
use ty::layout::{self, HasDataLayout, Size};

use super::{
Expand Down Expand Up @@ -148,4 +148,4 @@ impl<'tcx, Tag> Pointer<Tag> {
pub fn erase_tag(self) -> Pointer {
Pointer { alloc_id: self.alloc_id, offset: self.offset, tag: () }
}
}
}
1 change: 0 additions & 1 deletion src/librustc_mir/interpret/operand.rs
Expand Up @@ -12,7 +12,6 @@
//! All high-level functions to read from memory work on operands as sources.

use std::convert::TryInto;
use std::fmt;

use rustc::{mir, ty};
use rustc::ty::layout::{self, Size, LayoutOf, TyLayout, HasDataLayout, IntegerExt};
Expand Down

0 comments on commit 428af73

Please sign in to comment.