Allow enums with lifetime-only generics

[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 02aa72fdc46c2c36241f270b3e9b547df47ee49b..903ebfc5089f05217e13412af677cb4999ef7e14 100644 (file)
--- a/c-bindings-gen/src/main.rs
+++ b/c-bindings-gen/src/main.rs
@@ -849,7 +849,8 @@ fn writeln_struct<'a, 'b, W: std::io::Write>(w: &mut W, s: &'a syn::ItemStruct,
                                write!(w, "\t}}").unwrap();
                        },
                        syn::Fields::Unnamed(fields) => {
-                               assert!(s.generics.lt_token.is_none());
+                               assert!(!s.generics.params.iter()
+                                       .any(|gen| if let syn::GenericParam::Lifetime(_) = gen { false } else { true }));
                                writeln!(w, "{} (", types.maybe_resolve_ident(&s.ident).unwrap()).unwrap();
                                for (idx, field) in fields.unnamed.iter().enumerate() {
                                        write!(w, "\t\t").unwrap();
@@ -1779,7 +1780,7 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
                                                };
                                                if $ref || new_var {
                                                        if $ref {
-                                                               write!(w, "let mut {}_nonref = (*{}).clone();\n\t\t\t\t", $field_ident, $field_ident).unwrap();
+                                                               write!(w, "let mut {}_nonref = Clone::clone({});\n\t\t\t\t", $field_ident, $field_ident).unwrap();
                                                                if new_var {
                                                                        let nonref_ident = format_ident!("{}_nonref", $field_ident);
                                                                        if $to_c {