Correctly define the `native` type alias for enums with generic params

[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 536e4420bda0faa405636ce4452c60750b57dee5..b21c8d8c667c51fe765c57fb622f9182d9a96701 100644 (file)
--- a/c-bindings-gen/src/main.rs
+++ b/c-bindings-gen/src/main.rs
@@ -597,7 +597,16 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
                (s, i) => {
                        if let Some(supertrait) = types.crate_types.traits.get(s) {
                                let resolver = get_module_type_resolver!(s, types.crate_libs, types.crate_types);
-                               writeln!(w, "impl {} for {} {{", s, trait_name).unwrap();
+
+                               // Blindly assume that the same imports where `supertrait` is defined are also
+                               // imported here. This will almost certainly break at some point, but it should be
+                               // a compilation failure when it does so.
+                               write!(w, "impl").unwrap();
+                               maybe_write_lifetime_generics(w, &supertrait.generics, types);
+                               write!(w, " {}", s).unwrap();
+                               maybe_write_generics(w, &supertrait.generics, types, false);
+                               writeln!(w, " for {} {{", trait_name).unwrap();
+
                                impl_trait_for_c!(supertrait, format!(".{}", i), &resolver);
                                writeln!(w, "}}").unwrap();
                        } else {
@@ -1652,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) => {