Rebase fallout

diff --git a/src/librustc_mir/interpret/memory.rs b/src/librustc_mir/interpret/memory.rs
index b468943cbf0b12dad99037f5808673074bc60b2c..c7c6dd12846463aee4879479162e895be5ed4cf9 100644 (file)
--- a/src/librustc_mir/interpret/memory.rs
+++ b/src/librustc_mir/interpret/memory.rs
@@ -30,7 +30,7 @@
 use super::{
     Pointer, AllocId, Allocation, GlobalId, AllocationExtra, InboundsCheck,
     EvalResult, Scalar, EvalErrorKind, AllocType, PointerArithmetic,
-    Machine, AllocMap, MayLeak, ErrorHandled,
+    Machine, AllocMap, MayLeak, ErrorHandled, AllocationExtra,
 };
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone, Hash)]