File tree Expand file tree Collapse file tree 3 files changed +6
-8
lines changed Expand file tree Collapse file tree 3 files changed +6
-8
lines changed Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ fn test_dylib_with_error() -> Result<()> {
41
41
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 " ;
42
42
assert_eq ! (
43
43
expected_log_output,
44
- String :: from_utf8 ( e. downcast_ref:: <RunnerError >( ) . unwrap( ) . stderr. clone ( ) ) ?
44
+ e. downcast_ref:: <RunnerError >( ) . unwrap( ) . stderr
45
45
) ;
46
46
47
47
Ok ( ( ) )
Original file line number Diff line number Diff line change @@ -190,9 +190,7 @@ fn test_promises(builder: &mut Builder) -> Result<()> {
190
190
let mut runner = builder. input ( "promise.js" ) . build ( ) ?;
191
191
let res = runner. exec ( & [ ] ) ;
192
192
let err = res. err ( ) . unwrap ( ) . downcast :: < RunnerError > ( ) . unwrap ( ) ;
193
- assert ! ( str :: from_utf8( & err. stderr)
194
- . unwrap( )
195
- . contains( "Pending jobs in the event queue." ) ) ;
193
+ assert ! ( err. stderr. contains( "Pending jobs in the event queue." ) ) ;
196
194
197
195
Ok ( ( ) )
198
196
}
@@ -272,7 +270,7 @@ fn test_error_handling(builder: &mut Builder) -> Result<()> {
272
270
273
271
let expected_log_output = "Error:2:9 error\n at error (function.mjs:2:9)\n at <anonymous> (function.mjs:5:1)\n \n " ;
274
272
275
- assert_eq ! ( expected_log_output, str :: from_utf8 ( & err. stderr) . unwrap ( ) ) ;
273
+ assert_eq ! ( expected_log_output, err. stderr) ;
276
274
Ok ( ( ) )
277
275
}
278
276
Original file line number Diff line number Diff line change @@ -224,7 +224,7 @@ pub struct Runner {
224
224
#[ derive( Debug ) ]
225
225
pub struct RunnerError {
226
226
pub stdout : Vec < u8 > ,
227
- pub stderr : Vec < u8 > ,
227
+ pub stderr : String ,
228
228
pub err : anyhow:: Error ,
229
229
}
230
230
@@ -234,7 +234,7 @@ impl Display for RunnerError {
234
234
fn fmt ( & self , f : & mut Formatter < ' _ > ) -> fmt:: Result {
235
235
write ! (
236
236
f,
237
- "error: {:?}, stdout: {:?}, stderr: {:? }" ,
237
+ "error: {:?}, stdout: {:?}, stderr: {}" ,
238
238
self . err, self . stdout, self . stderr
239
239
)
240
240
}
@@ -809,7 +809,7 @@ impl Runner {
809
809
Ok ( _) => Ok ( ( output, logs, fuel_consumed) ) ,
810
810
Err ( err) => Err ( RunnerError {
811
811
stdout : output,
812
- stderr : logs,
812
+ stderr : String :: from_utf8 ( logs) . unwrap ( ) ,
813
813
err,
814
814
}
815
815
. into ( ) ) ,
You can’t perform that action at this time.
0 commit comments