From e32b8eb00a94274e680d1ae63c429d5b7db65e99 Mon Sep 17 00:00:00 2001
From: Christian Poveda <christianpoveda@protonmail.com>
Date: Wed, 26 Jun 2019 13:56:33 -0500
Subject: [PATCH] Remove default bound for Machine::MemoryExtra

---
 src/librustc_mir/const_eval.rs        | 3 ++-
 src/librustc_mir/interpret/machine.rs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/librustc_mir/const_eval.rs b/src/librustc_mir/const_eval.rs
index 96e45c2c8fe..4d5a2ccf659 100644
--- a/src/librustc_mir/const_eval.rs
+++ b/src/librustc_mir/const_eval.rs
@@ -636,7 +636,8 @@ pub fn const_eval_raw_provider<'tcx>(
         tcx.at(span),
         key.param_env,
         CompileTimeInterpreter::new(),
-        Default::default());
+        Default::default()
+    );
 
     let res = ecx.load_mir(cid.instance.def);
     res.map(|body| {
diff --git a/src/librustc_mir/interpret/machine.rs b/src/librustc_mir/interpret/machine.rs
index 4eb95f20d93..a3956e12300 100644
--- a/src/librustc_mir/interpret/machine.rs
+++ b/src/librustc_mir/interpret/machine.rs
@@ -73,7 +73,7 @@ pub trait Machine<'mir, 'tcx>: Sized {
     /// Extra data stored in memory. A reference to this is available when `AllocExtra`
     /// gets initialized, so you can e.g., have an `Rc` here if there is global state you
     /// need access to in the `AllocExtra` hooks.
-    type MemoryExtra: Default;
+    type MemoryExtra;
 
     /// Extra data stored in every allocation.
     type AllocExtra: AllocationExtra<Self::PointerTag> + 'static;