feat: remove expect and return error

torrust · Oct 8, 2024 · c235796 · c235796
1 parent e08fe61
commit c235796
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/rw/byte_writer.rs b/src/rw/byte_writer.rs
@@ -54,10 +54,9 @@ impl<W: Write> Writer for ByteWriter<W> {
     }
 
     fn get_captured_output(&mut self) -> Option<String> {
-        match &self.opt_captured_output {
-            Some(output) => Some(output.to_string()),
-            None => todo!(),
-        }
+        self.opt_captured_output
+            .as_ref()
+            .map(std::string::ToString::to_string)
     }
 
     fn print_captured_output(&self) {

diff --git a/src/rw/string_writer.rs b/src/rw/string_writer.rs
@@ -30,7 +30,7 @@ impl<W: Write> Writer for StringWriter<W> {
     fn write_byte(&mut self, byte: u8) -> Result<(), Error> {
         let c = byte as char;
 
-        self.writer.write_char(c).expect("error writing str");
+        self.writer.write_char(c)?;
 
         self.output_string_length += 1;
 
@@ -42,7 +42,7 @@ impl<W: Write> Writer for StringWriter<W> {
     }
 
     fn write_str(&mut self, value: &str) -> Result<(), Error> {
-        self.writer.write_str(value).expect("error writing str");
+        self.writer.write_str(value)?;
 
         self.output_string_length += value.len() as u64;