Merge pull request #200 from getditto/dhm/virtual-ptr-option

Allow `VirtualPtr` to be `Option`-wrapped
getditto · Jan 22, 2024 · cfd329c · cfd329c
2 parents 36ae9f3 + 8184a78
commit cfd329c
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ path = "src/_lib.rs"
 
 [package]
 name = "safer-ffi"
-version = "0.1.4"  # Keep in sync
+version = "0.1.5"  # Keep in sync
 authors = [
     "Daniel Henry-Mantilla <[email protected]>",
 ]
@@ -164,7 +164,7 @@ version = "0.0.3"
 
 [dependencies.safer_ffi-proc_macros]
 path = "src/proc_macro"
-version = "=0.1.4"  # Keep in sync
+version = "=0.1.5"  # Keep in sync
 
 [workspace]
 members = [

diff --git a/ffi_tests/Cargo.lock b/ffi_tests/Cargo.lock
diff --git a/js_tests/Cargo.lock b/js_tests/Cargo.lock
diff --git a/src/dyn_traits/_mod.rs b/src/dyn_traits/_mod.rs
@@ -115,6 +115,8 @@ impl<DynTrait : ?Sized + DynClone> Clone for VirtualPtr<DynTrait> {
 
 use hack::VirtualPtr_;
 mod hack {
+    use ::safer_ffi::layout;
+
     #[super::derive_ReprC]
     #[repr(C)]
     #[allow(missing_debug_implementations)]
@@ -123,6 +125,22 @@ mod hack {
         pub(in super) ptr: Ptr,
         pub(in super) vtable: VTable,
     }
+
+    unsafe
+    impl<Ptr, VTable>
+        layout::__HasNiche__
+    for
+        VirtualPtr_<Ptr, VTable>
+    where
+        Ptr : layout::ConcreteReprC + layout::__HasNiche__,
+        VTable : layout::ConcreteReprC,
+    {
+        fn is_niche (it: &'_ <Self as super::ReprC>::CLayout)
+          -> bool
+        {
+            Ptr::is_niche(&it.ptr)
+        }
+    }
 }
 
 #[derive_ReprC]

diff --git a/src/proc_macro/Cargo.toml b/src/proc_macro/Cargo.toml
@@ -4,7 +4,7 @@ proc-macro = true
 
 [package]
 name = "safer_ffi-proc_macros"
-version = "0.1.4"  # Keep in sync
+version = "0.1.5"  # Keep in sync
 authors = ["Daniel Henry-Mantilla <[email protected]>"]
 edition = "2021"