Rebase fallout

Author: oli-obk

Diff for: src/librustc/mir/interpret/pointer.rs

@@ -1,4 +1,4 @@
- use mir;
+use mir;
 use ty::layout::{self, HasDataLayout, Size};
 
 use super::{
@@ -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: () }
     }
-}
+}

Diff for: src/librustc_mir/interpret/operand.rs

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