simplify the Done type

Author: Robbepop

crates/wasmi/src/engine/executor/handler/dispatch.rs

@@ -455,15 +455,15 @@ impl Break {
 }
 
 pub type Control<C = (), B = Break> = ControlFlow<B, C>;
-pub type Done<T = NextState> = Control<T, Break>;
+pub type Done = Control<NextState, Break>;
 
 #[cfg(feature = "portable-dispatch")]
 pub trait ControlContinue: Sized {
     fn control_continue(ip: Ip, sp: Sp, mem0: Mem0Ptr, mem0_len: Mem0Len, instance: Inst) -> Self;
 }
 
 #[cfg(feature = "portable-dispatch")]
-impl ControlContinue for Done<NextState> {
+impl ControlContinue for Done {
     fn control_continue(ip: Ip, sp: Sp, mem0: Mem0Ptr, mem0_len: Mem0Len, instance: Inst) -> Self {
         Self::Continue(NextState {
             ip,
@@ -479,7 +479,7 @@ pub trait ControlBreak: Sized {
     fn control_break() -> Self;
 }
 
-impl<T> ControlBreak for Done<T> {
+impl<T> ControlBreak for Control<T, Break> {
     fn control_break() -> Self {
         Self::Break(Break::WithReason)
     }
@@ -510,7 +510,7 @@ macro_rules! done {
         $state.done_with(move || <_ as ::core::convert::Into<
             $crate::engine::executor::handler::DoneReason,
         >>::into($reason));
-        return <$crate::engine::executor::handler::Done<_> as $crate::engine::executor::handler::ControlBreak>::control_break();
+        return <$crate::engine::executor::handler::Control<_, Break> as $crate::engine::executor::handler::ControlBreak>::control_break();
     }};
 }