Pin compiler_builtins to 0.1.109 when building std

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

diff --git a/c-bindings-gen/src/blocks.rs b/c-bindings-gen/src/blocks.rs
index 7ee216a6774a2498c46814333760233cf796fc85..dc160d2ef0f2ce0f3dd2f58d4e390de49c048a7f 100644 (file)
--- a/c-bindings-gen/src/blocks.rs
+++ b/c-bindings-gen/src/blocks.rs
@@ -593,14 +593,19 @@ pub fn write_method_params<W: std::io::Write>(w: &mut W, sig: &syn::Signature, t
        write!(w, ")").unwrap();
        match &sig.output {
                syn::ReturnType::Type(_, rtype) => {
-                       write!(w, " -> ").unwrap();
-                       if let Some(mut remaining_path) = first_seg_self(&*rtype) {
-                               if remaining_path.next().is_none() {
-                                       write!(w, "{}", this_param).unwrap();
-                                       return;
+                       let mut ret_ty = Vec::new();
+                       types.write_c_type(&mut ret_ty, &*rtype, generics, true);
+
+                       if !ret_ty.is_empty() {
+                               write!(w, " -> ").unwrap();
+                               if let Some(mut remaining_path) = first_seg_self(&*rtype) {
+                                       if remaining_path.next().is_none() {
+                                               write!(w, "{}", this_param).unwrap();
+                                               return;
+                                       }
                                }
+                               w.write_all(&ret_ty).unwrap();
                        }
-                       types.write_c_type(w, &*rtype, generics, true);
                },
                _ => {},
        }
@@ -775,14 +780,18 @@ pub fn write_method_call_params<W: std::io::Write>(w: &mut W, sig: &syn::Signatu
 /// Prints concrete generic parameters for a struct/trait/function, including the less-than and
 /// greater-than symbols, if any generic parameters are defined.
 pub fn maybe_write_generics<W: std::io::Write>(w: &mut W, generics: &syn::Generics, generics_impld: &syn::PathArguments, types: &TypeResolver, concrete_lifetimes: bool) {
-       maybe_write_generics_intern(w, generics, generics_impld, types, concrete_lifetimes, false);
+       maybe_write_generics_intern(w, generics, Some(generics_impld), types, concrete_lifetimes, false);
 }
 
 pub fn maybe_write_non_lifetime_generics<W: std::io::Write>(w: &mut W, generics: &syn::Generics, generics_impld: &syn::PathArguments, types: &TypeResolver) {
-       maybe_write_generics_intern(w, generics, generics_impld, types, false, true);
+       maybe_write_generics_intern(w, generics, Some(generics_impld), types, false, true);
+}
+
+pub fn maybe_write_type_non_lifetime_generics<W: std::io::Write>(w: &mut W, generics: &syn::Generics, types: &TypeResolver) {
+       maybe_write_generics_intern(w, generics, None, types, false, true);
 }
 
-fn maybe_write_generics_intern<W: std::io::Write>(w: &mut W, generics: &syn::Generics, generics_impld: &syn::PathArguments, types: &TypeResolver, concrete_lifetimes: bool, dummy_lifetimes: bool) {
+fn maybe_write_generics_intern<W: std::io::Write>(w: &mut W, generics: &syn::Generics, generics_impld: Option<&syn::PathArguments>, types: &TypeResolver, concrete_lifetimes: bool, dummy_lifetimes: bool) {
        let mut gen_types = GenericTypes::new(None);
        assert!(gen_types.learn_generics(generics, types));
        if generics.params.is_empty() { return; }
@@ -811,25 +820,28 @@ fn maybe_write_generics_intern<W: std::io::Write>(w: &mut W, generics: &syn::Gen
        for (idx, generic) in generics.params.iter().enumerate() {
                match generic {
                        syn::GenericParam::Type(type_param) => {
-                               write!(w, "{}", if idx != 0 { ", " } else { "" }).unwrap();
+                               let mut out = Vec::new();
                                let type_ident = &type_param.ident;
                                if types.understood_c_type(&syn::parse_quote!(#type_ident), Some(&gen_types)) {
-                                       types.write_c_type_in_generic_param(w, &syn::parse_quote!(#type_ident), Some(&gen_types), false);
+                                       types.write_c_type_in_generic_param(&mut out, &syn::parse_quote!(#type_ident), Some(&gen_types), false);
                                } else {
-                                       if let syn::PathArguments::AngleBracketed(args) = generics_impld {
+                                       if let Some(syn::PathArguments::AngleBracketed(args)) = generics_impld {
                                                if let syn::GenericArgument::Type(ty) = &args.args[idx] {
-                                                       types.write_c_type_in_generic_param(w, &ty, Some(&gen_types), false);
+                                                       types.write_c_type_in_generic_param(&mut out, &ty, Some(&gen_types), false);
                                                }
                                        }
                                }
+                               if !out.is_empty() {
+                                       write!(w, "{}, ", String::from_utf8(out).unwrap()).unwrap();
+                               }
                        },
                        syn::GenericParam::Lifetime(lt) => {
                                if dummy_lifetimes {
-                                       write!(w, "'_").unwrap();
+                                       write!(w, "'_, ").unwrap();
                                } else if concrete_lifetimes {
-                                       write!(w, "'static").unwrap();
+                                       write!(w, "'static, ").unwrap();
                                } else {
-                                       write!(w, "{}'{}", if idx != 0 { ", " } else { "" }, lt.lifetime.ident).unwrap();
+                                       write!(w, "'{}, ", lt.lifetime.ident).unwrap();
                                }
                        },
                        _ => unimplemented!(),