diff options
author | Nayeem Rahman <nayeemrmn99@gmail.com> | 2020-10-31 18:57:19 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-31 19:57:19 +0100 |
commit | 07d23baa742145639dd600fda97785ec4a8b9687 (patch) | |
tree | e39f381e4c7e1b0dd01a5bd8e1da4dabd2c894a1 /core | |
parent | 03769f11b5db314c550478852317d9ea108c2f76 (diff) |
fix(core/error): Remove extra newline from JsError::fmt() (#8145)
Diffstat (limited to 'core')
-rw-r--r-- | core/error.rs | 6 | ||||
-rw-r--r-- | core/runtime.rs | 11 |
2 files changed, 7 insertions, 10 deletions
diff --git a/core/error.rs b/core/error.rs index 7f16af6c1..331feba20 100644 --- a/core/error.rs +++ b/core/error.rs @@ -364,11 +364,11 @@ impl Display for JsError { if let Some(stack) = &self.stack { let stack_lines = stack.lines(); if stack_lines.count() > 1 { - return writeln!(f, "{}", stack); + return write!(f, "{}", stack); } } - writeln!(f, "{}", self.message)?; + write!(f, "{}", self.message)?; if let Some(script_resource_name) = &self.script_resource_name { if self.line_number.is_some() && self.start_column.is_some() { let source_loc = format_source_loc( @@ -376,7 +376,7 @@ impl Display for JsError { self.line_number.unwrap(), self.start_column.unwrap(), ); - writeln!(f, " at {}", source_loc)?; + write!(f, "\n at {}", source_loc)?; } } Ok(()) diff --git a/core/runtime.rs b/core/runtime.rs index d7de91419..0fa465bf2 100644 --- a/core/runtime.rs +++ b/core/runtime.rs @@ -1775,7 +1775,7 @@ pub mod tests { match isolate.execute("infinite_loop.js", "for(;;) {}") { Ok(_) => panic!("execution should be terminated"), Err(e) => { - assert_eq!(e.to_string(), "Uncaught Error: execution terminated\n") + assert_eq!(e.to_string(), "Uncaught Error: execution terminated") } }; @@ -2518,8 +2518,7 @@ main(); "#, ); let expected_error = r#"Uncaught SyntaxError: Invalid or unexpected token - at error_without_stack.js:3:14 -"#; + at error_without_stack.js:3:14"#; assert_eq!(result.unwrap_err().to_string(), expected_error); } @@ -2545,8 +2544,7 @@ main(); let expected_error = r#"Error: assert at assert (error_stack.js:4:11) at main (error_stack.js:9:3) - at error_stack.js:12:1 -"#; + at error_stack.js:12:1"#; assert_eq!(result.unwrap_err().to_string(), expected_error); } @@ -2577,8 +2575,7 @@ main(); let expected_error = r#"Error: async at error_async_stack.js:5:13 at async error_async_stack.js:4:5 - at async error_async_stack.js:10:5 -"#; + at async error_async_stack.js:10:5"#; match runtime.poll_event_loop(cx) { Poll::Ready(Err(e)) => { |