Ensure an option always unwraps to a non-reference type

[ldk-c-bindings] / c-bindings-gen / src / types.rs

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index b92ca77c397c6d5af0b9e26098be36bafc527d72..f47bf9ed146397cfe80ec0e67fe8c83fb4140a4b 100644 (file)
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -1624,7 +1624,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                                        let inner_name = self.get_c_mangled_container_type(vec![single_contained.unwrap()], generics, "Option").unwrap();
                                                        return Some(("if ", vec![
                                                                (format!(".is_none() {{ {}::None }} else {{ {}::Some(/* WARNING: CLONING CONVERSION HERE! &Option<Enum> is otherwise un-expressable. */", inner_name, inner_name),
-                                                                format!("{}.clone().unwrap()", var_access))
+                                                                format!("(*{}.as_ref().unwrap()).clone()", var_access))
                                                                ], ") }", ContainerPrefixLocation::PerConv));
                                                }
                                        } else {
@@ -1717,10 +1717,10 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                                                                (format!("{} {{ None }} else {{ Some(", s), format!("unsafe {{ &mut *{} }}", var_access))
                                                                        ], ") }", ContainerPrefixLocation::NoPrefix)),
                                                                EmptyValExpectedTy::OptionType =>
-                                                                       return Some(("{ /* ", vec![
-                                                                               (format!("*/ let {}_opt = {};", var_name, var_access),
-                                                                               format!("}} if {}_opt{} {{ None }} else {{ Some({{ {}_opt.take()", var_name, s, var_name))
-                                                                       ], ") } }", ContainerPrefixLocation::PerConv)),
+                                                                       return Some(("{ /*", vec![
+                                                                               (format!("*/ let {}_opt = {}; if {}_opt{} {{ None }} else {{ Some({{", var_name, var_access, var_name, s),
+                                                                               format!("{{ {}_opt.take() }}", var_name))
+                                                                       ], "})} }", ContainerPrefixLocation::PerConv)),
                                                                EmptyValExpectedTy::NonPointer =>
                                                                        return Some(("if ", vec![
                                                                                (format!("{} {{ None }} else {{ Some(", s), format!("{}", var_access))