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

feat: allow v8::Data as a generic for get_*_from_snapshot_once (#1393)

Browse source
This commit is contained in:
Matt Mastracci 2024-02-09 13:39:30 -07:00 committed by GitHub
parent 477f5af361
commit a8606e3dcb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 51 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/scope.rs
View file

@ -245,6 +245,29 @@ impl<'s> HandleScope<'s, ()> {
}
}
// TODO(mmastrac): When the never type is stabilized, we can replace this trait
// with type bounds (https://github.com/rust-lang/rust/issues/35121):
// for<'l> DataError: From<<Local<'s, Data> as TryInto<Local<'l, T>>>::Error>,
mod get_data_sealed {
use crate::DataError;
use std::convert::Infallible;
pub trait ToDataError {
fn to_data_error(self) -> DataError;
}
impl ToDataError for DataError {
fn to_data_error(self) -> DataError {
self
}
}
impl ToDataError for Infallible {
fn to_data_error(self) -> DataError {
unreachable!()
}
}
}
impl<'s> HandleScope<'s> {
/// Return data that was previously attached to the isolate snapshot via
/// SnapshotCreator, and removes the reference to it. If called again with
@ -259,15 +282,22 @@ impl<'s> HandleScope<'s> {
) -> Result<Local<'s, T>, DataError>
where
T: 'static,
for<'l> Local<'l, Data>: TryInto<Local<'l, T>, Error = DataError>,
for<'l> <Local<'l, Data> as TryInto<Local<'l, T>>>::Error:
get_data_sealed::ToDataError,
for<'l> Local<'l, Data>: TryInto<Local<'l, T>>,
{
unsafe {
self
let Some(res) = self
.cast_local(|sd| {
raw::v8__Isolate__GetDataFromSnapshotOnce(sd.get_isolate_ptr(), index)
})
.ok_or_else(DataError::no_data::<T>)
.and_then(|data| data.try_into())
}) else {
return Err(DataError::no_data::<T>());
};
use get_data_sealed::ToDataError;
match res.try_into() {
Ok(x) => Ok(x),
Err(e) => Err(e.to_data_error()),
}
}
}
@ -284,18 +314,22 @@ impl<'s> HandleScope<'s> {
) -> Result<Local<'s, T>, DataError>
where
T: 'static,
for<'l> Local<'l, Data>: TryInto<Local<'l, T>, Error = DataError>,
for<'l> <Local<'l, Data> as TryInto<Local<'l, T>>>::Error:
get_data_sealed::ToDataError,
for<'l> Local<'l, Data>: TryInto<Local<'l, T>>,
{
unsafe {
self
let Some(res) = self
.cast_local(|sd| {
raw::v8__Context__GetDataFromSnapshotOnce(
sd.get_current_context(),
index,
)
})
.ok_or_else(DataError::no_data::<T>)
.and_then(|data| data.try_into())
raw::v8__Context__GetDataFromSnapshotOnce(sd.get_current_context(), index)
}) else {
return Err(DataError::no_data::<T>());
};
use get_data_sealed::ToDataError;
match res.try_into() {
Ok(x) => Ok(x),
Err(e) => Err(e.to_data_error()),
}
}
}

3
tests/test_api.rs
View file

@ -5309,6 +5309,9 @@ fn snapshot_creator() {
context_data_index_2,
);
assert!(matches!(bad_type_err, Err(v8::DataError::BadType { .. })));
// Ensure we can compile a request for v8::Data
_ = scope
.get_context_data_from_snapshot_once::<v8::Data>(context_data_index_2);
}
}
}