diff options
author | Bert Belder <bertbelder@gmail.com> | 2020-01-16 23:25:57 +0100 |
---|---|---|
committer | Bert Belder <bertbelder@gmail.com> | 2020-01-17 02:26:40 +0100 |
commit | d8ad81d3fb5b4b9502ea021edfc99201538553e6 (patch) | |
tree | 5739d1f5c8b2dc2e95c234444d7093c3cbfdf3f5 /core/isolate.rs | |
parent | 0a78bfb836f520d3709a32c8a978d08d33198d83 (diff) |
Upgrade to rusty_v8 v0.1.0 (#3691)
Diffstat (limited to 'core/isolate.rs')
-rw-r--r-- | core/isolate.rs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/core/isolate.rs b/core/isolate.rs index 5cbd5a5bf..50fcadb48 100644 --- a/core/isolate.rs +++ b/core/isolate.rs @@ -370,45 +370,45 @@ impl Isolate { pub fn handle_exception<'a>( &mut self, - s: &mut impl v8::ToLocal<'a>, - mut context: v8::Local<'a, v8::Context>, + scope: &mut impl v8::ToLocal<'a>, + context: v8::Local<'a, v8::Context>, exception: v8::Local<'a, v8::Value>, ) { - let isolate = context.get_isolate(); // TerminateExecution was called - if isolate.is_execution_terminating() { + if scope.isolate().is_execution_terminating() { // cancel exception termination so that the exception can be created - isolate.cancel_terminate_execution(); + scope.isolate().cancel_terminate_execution(); // maybe make a new exception object let exception = if exception.is_null_or_undefined() { - let exception_str = v8::String::new(s, "execution terminated").unwrap(); - v8::error(s, exception_str) + let exception_str = + v8::String::new(scope, "execution terminated").unwrap(); + v8::error(scope, exception_str) } else { exception }; // handle the exception as if it is a regular exception - self.handle_exception(s, context, exception); + self.handle_exception(scope, context, exception); // re-enable exception termination - context.get_isolate().terminate_execution(); + scope.isolate().terminate_execution(); return; } - let json_str = self.encode_exception_as_json(s, context, exception); + let json_str = self.encode_exception_as_json(scope, context, exception); self.last_exception = Some(json_str); - self.last_exception_handle.set(s, exception); + self.last_exception_handle.set(scope, exception); } pub fn encode_exception_as_json<'a>( &mut self, - s: &mut impl v8::ToLocal<'a>, + scope: &mut impl v8::ToLocal<'a>, context: v8::Local<'a, v8::Context>, exception: v8::Local<'a, v8::Value>, ) -> String { - let message = v8::create_message(s, exception); - self.encode_message_as_json(s, context, message) + let message = v8::create_message(scope, exception); + self.encode_message_as_json(scope, context, message) } pub fn encode_message_as_json<'a>( |