Merge remote-tracking branch 'origin' into porting-format

This commit is contained in:
Antonio Natilla
2021-11-02 21:23:50 +01:00
6 changed files with 105 additions and 38 deletions

View File

@ -104,9 +104,7 @@ pub fn create_default_context() -> EngineState {
working_set.render()
};
{
EngineState::merge_delta(&mut engine_state, delta);
}
engine_state.merge_delta(delta);
engine_state
}

View File

@ -30,7 +30,7 @@ pub fn test_examples(cmd: impl Command + 'static) {
working_set.render()
};
EngineState::merge_delta(&mut *engine_state, delta);
engine_state.merge_delta(delta);
for example in examples {
// Skip tests that don't have results to compare to
@ -50,7 +50,7 @@ pub fn test_examples(cmd: impl Command + 'static) {
(output, working_set.render())
};
EngineState::merge_delta(&mut engine_state, delta);
engine_state.merge_delta(delta);
let mut stack = Stack::new();