less ascii escaping if we are printing to stdout directly

2 files changed, 9 insertions, 10 deletions

diff --git a/src/parse/mod.rs b/src/parse/mod.rs
index e9cb4bf..1827122 100644
--- a/src/parse/mod.rs
+++ b/src/parse/mod.rs
@@ -337,9 +337,7 @@ impl CmdDisplay for Command<PreExpansion> {
 
 impl CmdDisplay for &[u8] {
     fn cdisplay(&self, w: &mut dyn std::io::Write) -> std::io::Result<()> {
-        write!(w, "b\"")?;
-        write!(w, "{}", self.escape_ascii())?;
-        write!(w, "\"")
+        write!(w, "\"{}\"", self.escape_ascii())
     }
 }
 
diff --git a/src/run/builtin.rs b/src/run/builtin.rs
index 335d07d..488ee04 100644
--- a/src/run/builtin.rs
+++ b/src/run/builtin.rs
@@ -362,7 +362,8 @@ impl Builtin for parse {
                     writeln!(stdout)?;
                 }
                 Err(err) => {
-                    writeln!(stdout, "err {:?} {}", err.0, err.1.escape_ascii())?;
+                    writeln!(stdout, "err {:?} ", err.0)?;
+                    stdout.write_all(&err.1)?;
                 }
             }
         }
@@ -484,11 +485,8 @@ impl Builtin for alias {
                     alias_args.append(&mut parsed);
                 }
                 Err(err) => {
-                    writeln!(
-                        stdout,
-                        "alias: unparseable argument ({err:?}): {}",
-                        arg.escape_ascii(),
-                    )?;
+                    writeln!(stdout, "alias: unparseable argument ({err:?}): ",)?;
+                    stdout.write_all(&arg)?;
                     parse_fail = true;
                 }
             }
@@ -969,7 +967,10 @@ mod dbg {
             for arg in args {
                 match &arg[..] {
                     b"keys" | b"keystrokes" => se.debug_keystrokes = !se.debug_keystrokes,
-                    _ => writeln!(stdout, "debug: unknown option {}", arg.escape_ascii())?,
+                    _ => {
+                        stdout.write_all(b"debug: unknown option ")?;
+                        stdout.write_all(&arg)?;
+                    }
                 }
             }
             Ok(())