From 6daa25b4fc928c6334801a2a90edfac0320e3177 Mon Sep 17 00:00:00 2001
From: Jeffrey Charles <jeff.charles@shopify.com>
Date: Wed, 6 Nov 2024 08:50:00 -0500
Subject: [PATCH] Use string for RunnerError instead of byte vector (#816)

---
 crates/cli/tests/dylib_test.rs       | 2 +-
 crates/cli/tests/integration_test.rs | 6 ++----
 crates/runner/src/lib.rs             | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/crates/cli/tests/dylib_test.rs b/crates/cli/tests/dylib_test.rs
index 60232253..ab05750a 100644
--- a/crates/cli/tests/dylib_test.rs
+++ b/crates/cli/tests/dylib_test.rs
@@ -41,7 +41,7 @@ fn test_dylib_with_error() -> Result<()> {
     let expected_log_output = "Error:1:24 foo error\n    at foo (function.mjs:1:24)\n    at <anonymous> (function.mjs:1:50)\n\n";
     assert_eq!(
         expected_log_output,
-        String::from_utf8(e.downcast_ref::<RunnerError>().unwrap().stderr.clone())?
+        e.downcast_ref::<RunnerError>().unwrap().stderr
     );
 
     Ok(())
diff --git a/crates/cli/tests/integration_test.rs b/crates/cli/tests/integration_test.rs
index b9d2c028..5b4b3499 100644
--- a/crates/cli/tests/integration_test.rs
+++ b/crates/cli/tests/integration_test.rs
@@ -190,9 +190,7 @@ fn test_promises(builder: &mut Builder) -> Result<()> {
     let mut runner = builder.input("promise.js").build()?;
     let res = runner.exec(&[]);
     let err = res.err().unwrap().downcast::<RunnerError>().unwrap();
-    assert!(str::from_utf8(&err.stderr)
-        .unwrap()
-        .contains("Pending jobs in the event queue."));
+    assert!(err.stderr.contains("Pending jobs in the event queue."));
 
     Ok(())
 }
@@ -272,7 +270,7 @@ fn test_error_handling(builder: &mut Builder) -> Result<()> {
 
     let expected_log_output = "Error:2:9 error\n    at error (function.mjs:2:9)\n    at <anonymous> (function.mjs:5:1)\n\n";
 
-    assert_eq!(expected_log_output, str::from_utf8(&err.stderr).unwrap());
+    assert_eq!(expected_log_output, err.stderr);
     Ok(())
 }
 
diff --git a/crates/runner/src/lib.rs b/crates/runner/src/lib.rs
index 8c7251ec..acc57c7e 100644
--- a/crates/runner/src/lib.rs
+++ b/crates/runner/src/lib.rs
@@ -224,7 +224,7 @@ pub struct Runner {
 #[derive(Debug)]
 pub struct RunnerError {
     pub stdout: Vec<u8>,
-    pub stderr: Vec<u8>,
+    pub stderr: String,
     pub err: anyhow::Error,
 }
 
@@ -234,7 +234,7 @@ impl Display for RunnerError {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         write!(
             f,
-            "error: {:?}, stdout: {:?}, stderr: {:?}",
+            "error: {:?}, stdout: {:?}, stderr: {}",
             self.err, self.stdout, self.stderr
         )
     }
@@ -809,7 +809,7 @@ impl Runner {
             Ok(_) => Ok((output, logs, fuel_consumed)),
             Err(err) => Err(RunnerError {
                 stdout: output,
-                stderr: logs,
+                stderr: String::from_utf8(logs).unwrap(),
                 err,
             }
             .into()),