feat: allow v8::Data as a generic for get_*_from_snapshot_once

src/scope.rs

@@ -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<'s, 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<'s, 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()),
+      }
     }
   }
 

tests/test_api.rs

@@ -5277,7 +5277,7 @@
   // value.
   {
     let params = v8::Isolate::create_params().snapshot_blob(startup_data);
     let isolate = &mut v8::Isolate::new(params);
     {
       let scope = &mut v8::HandleScope::new(isolate);
       let context = v8::Context::new(scope);
@@ -5290,25 +5290,28 @@
       let true_val = v8::Boolean::new(scope, true).into();
       assert!(result.same_value(true_val));
 
       let isolate_data = scope
         .get_isolate_data_from_snapshot_once::<v8::Value>(isolate_data_index);
       assert!(isolate_data.unwrap() == v8::Number::new(scope, 1.0));
       let no_data_err = scope
         .get_isolate_data_from_snapshot_once::<v8::Value>(isolate_data_index);
       assert!(matches!(no_data_err, Err(v8::DataError::NoData { .. })));
 
       let context_data = scope
         .get_context_data_from_snapshot_once::<v8::Value>(context_data_index);
       assert!(context_data.unwrap() == v8::Number::new(scope, 2.0));
       let no_data_err = scope
         .get_context_data_from_snapshot_once::<v8::Value>(context_data_index);
       assert!(matches!(no_data_err, Err(v8::DataError::NoData { .. })));
 
       let bad_type_err = scope
         .get_context_data_from_snapshot_once::<v8::Private>(
           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);
     }
   }
 }