Merge pull request #108 from mobusoperandi/repl_event_error

refactor: variant ReplEvent::Error
mobusoperandi · Jun 8, 2024 · 7696f4f · 7696f4f
2 parents 4fb81e5 + bc52819
commit 7696f4f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/app/state.rs b/src/app/state.rs
@@ -81,6 +81,7 @@ impl State {
             ReplEvent::Query(id, query, result) => self.repl_event_query(id, query, result),
             ReplEvent::Kill(id) => self.repl_event_kill(id),
             ReplEvent::Read(id, result) => self.repl_event_read(id, result),
+            ReplEvent::Error(error) => Err(error.into()),
         }
     }
 
@@ -121,14 +122,9 @@ impl State {
         Ok(Vec::new())
     }
 
-    fn repl_event_read(
-        &mut self,
-        id: ExampleId,
-        result: std::io::Result<u8>,
-    ) -> anyhow::Result<Vec<OutputEvent>> {
+    fn repl_event_read(&mut self, id: ExampleId, ch: u8) -> anyhow::Result<Vec<OutputEvent>> {
         let session_live = self.examples.get_mut_repl(&id)?;
         let session_live = session_live.state.live_mut()?;
-        let ch = result?;
 
         let output = match &mut session_live.expecting {
             ReplSessionExpecting::Nothing => anyhow::bail!("not expecting, got {:?}", ch as char),

diff --git a/src/repl/driver.rs b/src/repl/driver.rs
@@ -64,7 +64,8 @@ pub(crate) enum ReplEvent {
     Spawn(pty_process::Result<ExampleId>),
     Query(ExampleId, ReplQuery, anyhow::Result<()>),
     Kill(anyhow::Result<ExampleId>),
-    Read(ExampleId, std::io::Result<u8>),
+    Read(ExampleId, u8),
+    Error(std::io::Error),
 }
 
 pub(crate) struct ReplDriver {
@@ -102,15 +103,12 @@ impl ReplDriver {
                     match byte {
                         Ok(byte) => {
                             self.sender
-                                .send(ReplEvent::Read(id.clone(), Ok(byte)))
+                                .send(ReplEvent::Read(id.clone(), byte))
                                 .await
                                 .unwrap();
                         }
                         Err(error) => {
-                            self.sender
-                                .send(ReplEvent::Read(id.clone(), Err(error)))
-                                .await
-                                .unwrap();
+                            self.sender.send(ReplEvent::Error(error)).await.unwrap();
                         }
                     }
                 }