Fix owned opaque in out struct (#763)

rust-diplomat · Jan 15, 2025 · 22aa043 · 22aa043
1 parent c94ac61
commit 22aa043
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 21 deletions.
diff --git a/core/src/hir/paths.rs b/core/src/hir/paths.rs
@@ -70,6 +70,10 @@ impl<Owner: OpaqueOwner> OpaquePath<Optional, Owner> {
     pub fn is_optional(&self) -> bool {
         self.optional.0
     }
+
+    pub fn is_owned(&self) -> bool {
+        self.owner.is_owned()
+    }
 }
 
 impl<Owner: OpaqueOwner> OpaquePath<NonOptional, Owner> {

diff --git a/feature_tests/cpp/include/OptionStruct.hpp b/feature_tests/cpp/include/OptionStruct.hpp
diff --git a/feature_tests/cpp/tests/option.cpp b/feature_tests/cpp/tests/option.cpp
@@ -23,7 +23,6 @@ int main(int argc, char *argv[]) {
     simple_assert("new_struct_nones() returns None", !s.a);
     simple_assert("new_struct_nones() returns None", !s.b);
     simple_assert_eq("correct struct returned", s.c, 908);
-    simple_assert("new_struct_nones() returns None", !s.d);
 
     auto opt_u8 = OptionOpaque::accepts_option_u8(std::nullopt);
     simple_assert("accepts_option_u8 is idempotent", !opt_u8.has_value());

diff --git a/feature_tests/dart/lib/src/OptionStruct.g.dart b/feature_tests/dart/lib/src/OptionStruct.g.dart
diff --git a/feature_tests/dart/test/option_test.dart b/feature_tests/dart/test/option_test.dart
@@ -17,7 +17,6 @@ void main() {
     expect(sn.a, null);
     expect(sn.b, null);
     expect(sn.c, 908);
-    expect(sn.d, null);
 
     var maybeU8 = OptionOpaque.acceptsOptionU8(null);
     expect(maybeU8, null);

diff --git a/feature_tests/js/api/OptionStruct.d.ts b/feature_tests/js/api/OptionStruct.d.ts
diff --git a/feature_tests/js/api/OptionStruct.mjs b/feature_tests/js/api/OptionStruct.mjs
diff --git a/feature_tests/js/test/option.mts b/feature_tests/js/test/option.mts
@@ -20,7 +20,6 @@ test("Verify option methods", t => {
     t.assert(!sn.a);
     t.assert(!sn.b);
     t.is(sn.c, 908);
-    t.assert(!sn.d);
 });
 
 test("DiplomatOption tests", t => {

diff --git a/feature_tests/kotlin/somelib/src/main/kotlin/dev/diplomattest/somelib/OptionStruct.kt b/feature_tests/kotlin/somelib/src/main/kotlin/dev/diplomattest/somelib/OptionStruct.kt
diff --git a/feature_tests/kotlin/somelib/src/test/kotlin/dev/diplomattest/somelib/OptionOpaqueTest.kt b/feature_tests/kotlin/somelib/src/test/kotlin/dev/diplomattest/somelib/OptionOpaqueTest.kt
diff --git a/feature_tests/src/option.rs b/feature_tests/src/option.rs
@@ -35,7 +35,7 @@ pub mod ffi {
         a: Option<Box<OptionOpaque>>,
         b: Option<Box<OptionOpaqueChar>>,
         c: u32,
-        d: Option<Box<OptionOpaque>>,
+        d: Box<OptionOpaque>,
     }
 
     #[diplomat::attr(not(supports = option), disable)]
@@ -101,7 +101,7 @@ pub mod ffi {
                 a: Some(Box::new(OptionOpaque(101))),
                 b: Some(Box::new(OptionOpaqueChar('餐'))),
                 c: 904,
-                d: Some(Box::new(OptionOpaque(926535))),
+                d: Box::new(OptionOpaque(926535)),
             }
         }
 
@@ -110,7 +110,7 @@ pub mod ffi {
                 a: None,
                 b: None,
                 c: 908,
-                d: None,
+                d: Box::new(OptionOpaque(926535)),
             }
         }
 

diff --git a/tool/src/cpp/ty.rs b/tool/src/cpp/ty.rs
@@ -549,6 +549,7 @@ impl<'ccx, 'tcx: 'ccx> TyGenContext<'ccx, 'tcx, '_> {
             Type::Opaque(ref op) if op.is_optional() => {
                 format!("{cpp_name} ? {cpp_name}->AsFFI() : nullptr").into()
             }
+            Type::Opaque(ref path) if path.is_owned() => format!("{cpp_name}->AsFFI()").into(),
             Type::Opaque(..) => format!("{cpp_name}.AsFFI()").into(),
             Type::Struct(..) => format!("{cpp_name}.AsFFI()").into(),
             Type::Enum(..) => format!("{cpp_name}.AsFFI()").into(),