Merge pull request #157 from 9999years/wiggles/swrv

Don't mangle escapes in `Error::Timeout`

Author: epage

src/error.rs

@@ -2,7 +2,7 @@ use std::time;
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
-    #[error("EOF (End of File): Expected {} but got EOF after reading \"{}\" process terminated with {:?}", .expected, .got, .exit_code.as_ref().unwrap_or(&"unknown".to_owned()))]
+    #[error("EOF (End of File): Expected {:?} but got EOF after reading {:?} process terminated with {:?}", .expected, .got, .exit_code.as_ref().unwrap_or(&"unknown".to_owned()))]
     EOF {
         expected: String,
         got: String,
@@ -12,7 +12,7 @@ pub enum Error {
     #[error("PipeError")]
     BrokenPipe,
 
-    #[error("Timeout Error: Expected {} but got \"{}\" (after waiting {} ms)", .expected, .got, (.timeout.as_secs() * 1000) as u32 + .timeout.subsec_millis())]
+    #[error("Timeout Error: Expected {:?} but got {:?} (after waiting {} ms)", .expected, .got, (.timeout.as_secs() * 1000) as u32 + .timeout.subsec_millis())]
     Timeout {
         expected: String,
         got: String,

src/reader.rs

@@ -273,12 +273,7 @@ impl NBReader {
                 if start.elapsed() > timeout {
                     return Err(Error::Timeout {
                         expected: needle.to_string(),
-                        got: self
-                            .buffer
-                            .clone()
-                            .replace('\n', "`\\n`\n")
-                            .replace('\r', "`\\r`")
-                            .replace('\u{1b}', "`^`"),
+                        got: self.buffer.clone(),
                         timeout,
                     });
                 }