Set `ptr_for_ref` correctly when writing conversions for enum fields

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

diff --git a/c-bindings-gen/src/main.rs b/c-bindings-gen/src/main.rs
index 266bf5877508ec24133c5c009244a3162b1facf2..1d18a07c9c7e11ad9f4c370a0a931d011288b5ff 100644 (file)
--- a/c-bindings-gen/src/main.rs
+++ b/c-bindings-gen/src/main.rs
@@ -1610,15 +1610,15 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
                                writeln_field_docs(w, &field.attrs, "\t\t", types, Some(&gen_types), &field.ty);
                                write!(w, "\t\t{}: ", field.ident.as_ref().unwrap()).unwrap();
                                write!(&mut constr, "{}{}: ", if idx != 0 { ", " } else { "" }, field.ident.as_ref().unwrap()).unwrap();
-                               types.write_c_type(w, &field.ty, Some(&gen_types), false);
-                               types.write_c_type(&mut constr, &field.ty, Some(&gen_types), false);
+                               types.write_c_type(w, &field.ty, Some(&gen_types), true);
+                               types.write_c_type(&mut constr, &field.ty, Some(&gen_types), true);
                                writeln!(w, ",").unwrap();
                        }
                        write!(w, "\t}}").unwrap();
                } else if let syn::Fields::Unnamed(fields) = &var.fields {
                        if fields.unnamed.len() == 1 {
                                let mut empty_check = Vec::new();
-                               types.write_c_type(&mut empty_check, &fields.unnamed[0].ty, Some(&gen_types), false);
+                               types.write_c_type(&mut empty_check, &fields.unnamed[0].ty, Some(&gen_types), true);
                                if empty_check.is_empty() {
                                        empty_tuple_variant = true;
                                }
@@ -1629,8 +1629,8 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
                                for (idx, field) in fields.unnamed.iter().enumerate() {
                                        if export_status(&field.attrs) == ExportStatus::TestOnly { continue; }
                                        write!(&mut constr, "{}: ", ('a' as u8 + idx as u8) as char).unwrap();
-                                       types.write_c_type(w, &field.ty, Some(&gen_types), false);
-                                       types.write_c_type(&mut constr, &field.ty, Some(&gen_types), false);
+                                       types.write_c_type(w, &field.ty, Some(&gen_types), true);
+                                       types.write_c_type(&mut constr, &field.ty, Some(&gen_types), true);
                                        if idx != fields.unnamed.len() - 1 {
                                                write!(w, ",").unwrap();
                                                write!(&mut constr, ",").unwrap();
@@ -1661,7 +1661,10 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
                writeln!(&mut constr, "}}").unwrap();
                writeln!(w, ",").unwrap();
        }
-       writeln!(w, "}}\nuse {}::{} as native{};\nimpl {} {{", types.module_path, e.ident, e.ident, e.ident).unwrap();
+       writeln!(w, "}}\nuse {}::{} as {}Import;", types.module_path, e.ident, e.ident).unwrap();
+       write!(w, "pub(crate) type native{} = {}Import", e.ident, e.ident).unwrap();
+       maybe_write_generics(w, &e.generics, &types, true);
+       writeln!(w, ";\n\nimpl {} {{", e.ident).unwrap();
 
        macro_rules! write_conv {
                ($fn_sig: expr, $to_c: expr, $ref: expr) => {
@@ -1679,7 +1682,7 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
                                } else if let syn::Fields::Unnamed(fields) = &var.fields {
                                        if fields.unnamed.len() == 1 {
                                                let mut empty_check = Vec::new();
-                                               types.write_c_type(&mut empty_check, &fields.unnamed[0].ty, Some(&gen_types), false);
+                                               types.write_c_type(&mut empty_check, &fields.unnamed[0].ty, Some(&gen_types), true);
                                                if empty_check.is_empty() {
                                                        empty_tuple_variant = true;
                                                }
@@ -1701,7 +1704,7 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
                                                let mut sink = ::std::io::sink();
                                                let mut out: &mut dyn std::io::Write = if $ref { &mut sink } else { w };
                                                let new_var = if $to_c {
-                                                       types.write_to_c_conversion_new_var(&mut out, $field_ident, &$field.ty, Some(&gen_types), false)
+                                                       types.write_to_c_conversion_new_var(&mut out, $field_ident, &$field.ty, Some(&gen_types), true)
                                                } else {
                                                        types.write_from_c_conversion_new_var(&mut out, $field_ident, &$field.ty, Some(&gen_types))
                                                };
@@ -1711,7 +1714,7 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
                                                                if new_var {
                                                                        let nonref_ident = format_ident!("{}_nonref", $field_ident);
                                                                        if $to_c {
-                                                                               types.write_to_c_conversion_new_var(w, &nonref_ident, &$field.ty, Some(&gen_types), false);
+                                                                               types.write_to_c_conversion_new_var(w, &nonref_ident, &$field.ty, Some(&gen_types), true);
                                                                        } else {
                                                                                types.write_from_c_conversion_new_var(w, &nonref_ident, &$field.ty, Some(&gen_types));
                                                                        }
@@ -1743,14 +1746,14 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
                                        ($field: expr, $field_ident: expr) => { {
                                                if export_status(&$field.attrs) == ExportStatus::TestOnly { continue; }
                                                if $to_c {
-                                                       types.write_to_c_conversion_inline_prefix(w, &$field.ty, Some(&gen_types), false);
+                                                       types.write_to_c_conversion_inline_prefix(w, &$field.ty, Some(&gen_types), true);
                                                } else {
                                                        types.write_from_c_conversion_prefix(w, &$field.ty, Some(&gen_types));
                                                }
                                                write!(w, "{}{}", $field_ident,
                                                        if $ref { "_nonref" } else { "" }).unwrap();
                                                if $to_c {
-                                                       types.write_to_c_conversion_inline_suffix(w, &$field.ty, Some(&gen_types), false);
+                                                       types.write_to_c_conversion_inline_suffix(w, &$field.ty, Some(&gen_types), true);
                                                } else {
                                                        types.write_from_c_conversion_suffix(w, &$field.ty, Some(&gen_types));
                                                }