Use trait indirection for Option FFI

facebookexperimental · Jun 30, 2024 · 7249c36 · 7249c36
1 parent a597efe
commit 7249c36
Show file tree

Hide file tree

Showing 11 changed files with 590 additions and 444 deletions.
diff --git a/macro/src/expand.rs b/macro/src/expand.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -481,7 +481,6 @@ pub use crate::cxx_vector::CxxVector;
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 pub use crate::exception::Exception;
 pub use crate::extern_type::{kind, ExternType};
-pub use crate::rust_option::RustOption;
 pub use crate::shared_ptr::SharedPtr;
 pub use crate::string::CxxString;
 pub use crate::unique_ptr::UniquePtr;
@@ -513,8 +512,8 @@ pub mod private {
     pub use crate::opaque::Opaque;
     #[cfg(feature = "alloc")]
     pub use crate::result::{r#try, Result};
-    pub use crate::rust_option::assert_option_safe;
-    pub use crate::rust_option::RustOption;
+    pub use crate::rust_option::OptionFfi;
+    pub use crate::rust_option::OptionFfiInverse;
     pub use crate::rust_slice::RustSlice;
     pub use crate::rust_str::RustStr;
     #[cfg(feature = "alloc")]