diff options
| author | Christian Poveda <christianpoveda@protonmail.com> | 2019-06-26 13:56:33 -0500 |
|---|---|---|
| committer | Christian Poveda <christianpoveda@protonmail.com> | 2019-06-29 09:29:56 -0500 |
| commit | e32b8eb00a94274e680d1ae63c429d5b7db65e99 (patch) | |
| tree | 3fc0964e7aaf1494876f9032a04e288e7c03892f /src | |
| parent | e47553909650b4e4339e902eaa19c0fbdf3610ab (diff) | |
| download | rust-e32b8eb00a94274e680d1ae63c429d5b7db65e99.tar.gz rust-e32b8eb00a94274e680d1ae63c429d5b7db65e99.zip | |
Remove default bound for Machine::MemoryExtra
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_mir/const_eval.rs | 3 | ||||
| -rw-r--r-- | 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; |
