[opentitanlib] remove impossible exit statuses from UartConsole

With stdin handling removed, these exit statuses are not longer possible.

Signed-off-by: Gary Guo <[email protected]>

Author: nbdd0121

sw/host/opentitanlib/src/test_utils/rpc.rs

@@ -1,7 +1,7 @@
 // Copyright lowRISC contributors (OpenTitan project).
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
-use anyhow::{Result, anyhow};
+use anyhow::Result;
 use crc::{CRC_32_ISO_HDLC, Crc};
 use regex::Regex;
 use serde::Serialize;
@@ -100,7 +100,6 @@ where
                 Err(err.into())
             }
             ExitStatus::Timeout => Err(ConsoleError::GenericError("Timed Out".into()).into()),
-            _ => Err(anyhow!("Impossible result: {:?}", result)),
         }
     }
 }

sw/host/opentitanlib/src/uart/console.rs

@@ -23,8 +23,6 @@ pub struct UartConsole {
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum ExitStatus {
-    None,
-    CtrlC,
     Timeout,
     ExitSuccess,
     ExitFailure,

sw/host/opentitantool/src/command/console.rs

@@ -59,7 +59,7 @@ const CTRL_B: u8 = 2;
 const CTRL_C: u8 = 3;
 
 /// Takes input from an input stream and send it to a console device. Breaks are handled.
-async fn process_input<T, R: AsyncRead + Unpin>(device: &T, stdin: &mut R) -> Result<ExitStatus>
+async fn process_input<T, R: AsyncRead + Unpin>(device: &T, stdin: &mut R) -> Result<()>
 where
     T: ConsoleDevice + ?Sized,
 {
@@ -69,7 +69,7 @@ where
         let len = stdin.read(&mut buf).await?;
         if len == 1 {
             if buf[0] == CTRL_C {
-                return Ok(ExitStatus::CtrlC);
+                return Ok(());
             }
             if buf[0] == CTRL_B {
                 break_en = !break_en;
@@ -147,10 +147,10 @@ impl CommandDispatch for Console {
 
                     let rx = console.interact_async(&*uart, Some(&mut stdout));
 
-                    tokio::select! {
-                        v = tx => v,
-                        v = rx => v,
-                    }
+                    Result::<_>::Ok(tokio::select! {
+                        v = tx => Err(v?),
+                        v = rx => Ok(v?),
+                    })
                 })
             })??
         };
@@ -159,8 +159,8 @@ impl CommandDispatch for Console {
         }
 
         match status {
-            ExitStatus::None | ExitStatus::CtrlC => Ok(None),
-            ExitStatus::Timeout => {
+            Err(()) => Ok(None),
+            Ok(ExitStatus::Timeout) => {
                 if self.exit_success.is_some() {
                     // If there was a console exit success condition, then a timeout
                     // represents an error.
@@ -171,17 +171,27 @@ impl CommandDispatch for Console {
                     Ok(None)
                 }
             }
-            ExitStatus::ExitSuccess => {
+            Ok(ExitStatus::ExitSuccess) => {
                 log::info!(
                     "ExitSuccess({:?})",
-                    console.captures(status).unwrap().get(0).unwrap().as_str()
+                    console
+                        .captures(ExitStatus::ExitSuccess)
+                        .unwrap()
+                        .get(0)
+                        .unwrap()
+                        .as_str()
                 );
                 Ok(None)
             }
-            ExitStatus::ExitFailure => {
+            Ok(ExitStatus::ExitFailure) => {
                 log::info!(
                     "ExitFailure({:?})",
-                    console.captures(status).unwrap().get(0).unwrap().as_str()
+                    console
+                        .captures(ExitStatus::ExitFailure)
+                        .unwrap()
+                        .get(0)
+                        .unwrap()
+                        .as_str()
                 );
                 Err(anyhow!("Matched exit_failure expression"))
             }

sw/host/tests/chip/power_virus/src/main.rs

@@ -34,7 +34,6 @@ fn power_virus_systemtest(opts: &Opts, transport: &TransportWrapper) -> Result<(
     let mut stdout = std::io::stdout();
     let result = console.interact(&*uart, Some(&mut stdout))?;
     match result {
-        ExitStatus::None | ExitStatus::CtrlC => Ok(()),
         ExitStatus::Timeout => Err(anyhow!("Console timeout exceeded")),
         ExitStatus::ExitSuccess => {
             log::info!(

sw/host/tests/chip/rv_core_ibex_epmp/src/main.rs

@@ -72,7 +72,6 @@ fn ibex_epmp_test(opts: &Opts, transport: &TransportWrapper) -> Result<()> {
     let mut stdout = std::io::stdout();
     let result = console.interact(&*uart, Some(&mut stdout))?;
     match result {
-        ExitStatus::None | ExitStatus::CtrlC => Ok(()),
         ExitStatus::Timeout => Err(anyhow!("Console timeout exceeded")),
         ExitStatus::ExitSuccess => {
             log::info!(

sw/host/tests/chip/spi_device_ottf_console/src/main.rs

@@ -95,7 +95,6 @@ fn spi_device_console_test(opts: &Opts, transport: &TransportWrapper) -> Result<
 
     let result = console.interact(&spi_console_device, Some(&mut stdout))?;
     match result {
-        ExitStatus::None | ExitStatus::CtrlC => Ok(()),
         ExitStatus::Timeout => Err(anyhow!("Console timeout exceeded")),
         ExitStatus::ExitSuccess => {
             log::info!(

sw/host/tests/manuf/individualize_sw_cfg_functest/src/main.rs

@@ -63,7 +63,6 @@ fn individualize_sw_cfg(opts: &Opts, transport: &TransportWrapper) -> Result<()>
     let mut stdout = std::io::stdout();
     let result = console.interact(&*uart, Some(&mut stdout))?;
     match result {
-        ExitStatus::None | ExitStatus::CtrlC => Ok(()),
         ExitStatus::Timeout => Err(anyhow!("Console timeout exceeded")),
         ExitStatus::ExitSuccess => {
             log::info!(

sw/host/tests/manuf/manuf_cp_ast_test_execution/src/main.rs

@@ -97,7 +97,6 @@ fn manuf_cp_ast_text_execution_write_otp(opts: &Opts, transport: &TransportWrapp
     let mut stdout = std::io::stdout();
     let result = console.interact(&*uart, Some(&mut stdout))?;
     match result {
-        ExitStatus::None | ExitStatus::CtrlC => Ok(()),
         ExitStatus::Timeout => Err(anyhow!("Console timeout exceeded")),
         ExitStatus::ExitSuccess => {
             log::info!(

sw/host/tests/manuf/manuf_cp_device_info_flash_wr/src/main.rs

@@ -113,7 +113,6 @@ fn manuf_cp_device_info_flash_wr(opts: &Opts, transport: &TransportWrapper) -> R
     let mut stdout = std::io::stdout();
     let result = console.interact(&*uart, Some(&mut stdout))?;
     match result {
-        ExitStatus::None | ExitStatus::CtrlC => Ok(()),
         ExitStatus::Timeout => Err(anyhow!("Console timeout exceeded")),
         ExitStatus::ExitSuccess => {
             log::info!(