Skip to content

Commit

Permalink
Remove default bound for Machine::MemoryExtra
Browse files Browse the repository at this point in the history
  • Loading branch information
pvdrz committed Jun 29, 2019
1 parent e475539 commit e32b8eb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/librustc_mir/const_eval.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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| {
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_mir/interpret/machine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e32b8eb

Please sign in to comment.