foster/denoland-rusty-v8
0
0
Fork 0
mirror of https://github.com/denoland/rusty_v8.git synced 2024-12-25 08:39:15 -05:00
Code Issues Activity

Some clean-ups after making Locker a Scope (#231)

Browse source
This commit is contained in:
Bert Belder 2020-01-21 03:14:00 +01:00
parent 44d58f8f48
commit b3d93dad78
No known key found for this signature in database
GPG key ID: 7A77887B2E2ED461
5 changed files with 10 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/binding.cc
View file

@ -631,14 +631,12 @@ void v8__Template__Set(v8::Template& self, v8::Local<v8::Name> key,
}
v8::ObjectTemplate* v8__ObjectTemplate__New(
v8::Isolate* isolate,
v8::Local<v8::FunctionTemplate> templ) {
v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> templ) {
return local_to_ptr(v8::ObjectTemplate::New(isolate, templ));
}
v8::Object* v8__ObjectTemplate__NewInstance(
v8::ObjectTemplate& self,
v8::Local<v8::Context> context) {
v8::Object* v8__ObjectTemplate__NewInstance(v8::ObjectTemplate& self,
v8::Local<v8::Context> context) {
return maybe_local_to_ptr(self.NewInstance(context));
}
@ -903,8 +901,8 @@ v8::Function* v8__FunctionTemplate__GetFunction(
return maybe_local_to_ptr(self->GetFunction(context));
}
void v8__FunctionTemplate__SetClassName(
v8::Local<v8::FunctionTemplate> self, v8::Local<v8::String> name) {
void v8__FunctionTemplate__SetClassName(v8::Local<v8::FunctionTemplate> self,
v8::Local<v8::String> name) {
self->SetClassName(name);
}
@ -942,11 +940,6 @@ v8::Value* v8__ReturnValue__Get(const v8::ReturnValue<v8::Value>& self) {
return local_to_ptr(self.Get());
}
v8::Isolate* v8__ReturnValue__GetIsolate(
const v8::ReturnValue<v8::Value>& self) {
return self.GetIsolate();
}
int v8__StackTrace__GetFrameCount(v8::StackTrace* self) {
return self->GetFrameCount();
}

3
src/scope.rs
View file

@ -176,8 +176,7 @@ impl<'s, S, P> Entered<'s, S, P> {
/// instead.
///
/// A CallbackScope can be created from the following inputs:
/// - `&mut Isolate`
/// ` - `Local<Context>`
/// - `Local<Context>`
/// - `Local<Message>`
/// - `Local<Object>`
/// - `Local<Promise>`

16
src/scope_traits.rs
View file

@ -14,7 +14,6 @@ use crate::Locker;
use crate::Message;
use crate::Object;
use crate::PropertyCallbackInfo;
use crate::ReturnValue;
pub(crate) mod internal {
use super::*;
@ -33,7 +32,6 @@ pub(crate) mod internal {
fn v8__PropertyCallbackInfo__GetIsolate(
self_: &PropertyCallbackInfo,
) -> *mut Isolate;
fn v8__ReturnValue__GetIsolate(self_: &ReturnValue) -> *mut Isolate;
}
/// Internal trait for retrieving a raw Isolate pointer from various V8
@ -132,16 +130,8 @@ pub(crate) mod internal {
unsafe { v8__PropertyCallbackInfo__GetIsolate(self) }
}
}
impl<'a> GetRawIsolate for ReturnValue<'a> {
fn get_raw_isolate(&self) -> *mut Isolate {
unsafe { v8__ReturnValue__GetIsolate(self) }
}
}
}
use internal::GetRawIsolate;
/// Trait for retrieving the current isolate from a scope object.
pub trait InIsolate {
// Do not implement this trait on unscoped Isolate references
@ -149,12 +139,6 @@ pub trait InIsolate {
fn isolate(&mut self) -> &mut Isolate;
}
impl InIsolate for Locker {
fn isolate(&mut self) -> &mut Isolate {
unsafe { &mut *self.get_raw_isolate() }
}
}
impl<'s, S, P> InIsolate for Entered<'s, S, P>
where
S: internal::GetRawIsolate,

4
tests/compile_fail/handle_scope_escape_lifetime.rs
View file

@ -2,8 +2,8 @@
use rusty_v8 as v8;
pub fn main() {
let mut locker: v8::Locker = mock();
let mut hs0 = v8::HandleScope::new(&mut locker);
let mut locker = v8::Locker::new(mock());
let mut hs0 = v8::HandleScope::new(locker.enter());
let hs0 = hs0.enter();
let _fail = {

4
tests/compile_fail/handle_scope_lifetimes.rs
View file

@ -2,8 +2,8 @@
use rusty_v8 as v8;
pub fn main() {
let mut locker: v8::Locker = mock();
let mut root_hs = v8::HandleScope::new(&mut locker);
let mut locker = v8::Locker::new(mock());
let mut root_hs = v8::HandleScope::new(locker.enter());
let root_hs = root_hs.enter();
{