Refactor ServerInstruction enum to use Action enum

1 files changed, 4 insertions, 8 deletions

diff --git a/src/common/errors.rs b/src/common/errors.rs
index 5685f885..e98bec92 100644
--- a/src/common/errors.rs
+++ b/src/common/errors.rs
@@ -350,15 +350,13 @@ pub enum ServerContext {
     SplitVertically,
     MoveFocus,
     NewClient,
-    ToPty,
-    ToScreen,
+    Action,
     Render,
-    PluginUpdate,
+    TerminalResize,
     DoneClosingPane,
     DoneOpeningNewPane,
     DoneUpdatingTabs,
     ClientExit,
-    ClientShouldExit,
     Exit,
 }
 
@@ -370,15 +368,13 @@ impl From<&ServerInstruction> for ServerContext {
             ServerInstruction::SplitVertically => ServerContext::SplitVertically,
             ServerInstruction::MoveFocus => ServerContext::MoveFocus,
             ServerInstruction::NewClient(..) => ServerContext::NewClient,
-            ServerInstruction::ToPty(_) => ServerContext::ToPty,
-            ServerInstruction::ToScreen(_) => ServerContext::ToScreen,
-            ServerInstruction::PluginUpdate(..) => ServerContext::PluginUpdate,
+            ServerInstruction::Action(_) => ServerContext::Action,
+            ServerInstruction::TerminalResize(_) => ServerContext::TerminalResize,
             ServerInstruction::Render(_) => ServerContext::Render,
             ServerInstruction::DoneClosingPane => ServerContext::DoneClosingPane,
             ServerInstruction::DoneOpeningNewPane => ServerContext::DoneOpeningNewPane,
             ServerInstruction::DoneUpdatingTabs => ServerContext::DoneUpdatingTabs,
             ServerInstruction::ClientExit => ServerContext::ClientExit,
-            ServerInstruction::ClientShouldExit => ServerContext::ClientShouldExit,
             ServerInstruction::Exit => ServerContext::Exit,
         }
     }