X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Fblocks.rs;h=84a971bd43405dbfa877d60762f5c4e24d68cd58;hb=c98ebb54cc7f57f8c4c31d01ec69c81b172e49b1;hp=5034b0902c1140fb0002f2098971578aee87aa5e;hpb=b2819774e287d465e23415cbfdaa397e2e0a2749;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/blocks.rs b/c-bindings-gen/src/blocks.rs
index 5034b09..84a971b 100644
--- a/c-bindings-gen/src/blocks.rs
+++ b/c-bindings-gen/src/blocks.rs
@@ -460,7 +460,7 @@ fn writeln_docs_impl<'a, W: std::io::Write, I>(w: &mut W, attrs: &[syn::Attribut
 			},
 		}
 	}
-	if let Some((types, generics, inp, outp, field)) = method_args_ret {
+	if let Some((types, generics, inp, outp, field_ty)) = method_args_ret {
 		let mut nullable_found = false;
 		for (name, inp) in inp {
 			if types.skip_arg(inp, generics) { continue; }
@@ -491,8 +491,13 @@ fn writeln_docs_impl<'a, W: std::io::Write, I>(w: &mut W, attrs: &[syn::Attribut
 			nullable_found = true;
 			writeln!(w, "{}/// Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None", prefix).unwrap();
 		}
+		let field = field_ty.map(|ty| generics.resolve_type(ty));
 		if if let Some(syn::Type::Reference(syn::TypeReference { elem, .. })) = field {
 			if let syn::Type::Path(syn::TypePath { ref path, .. }) = &**elem {
+				let resolved_path = types.resolve_path(path, generics);
+				if types.crate_types.opaques.get(&resolved_path).is_some() {
+					writeln!(w, "{}/// Note that this field is expected to be a reference.", prefix).unwrap();
+				}
 				types.is_path_transparent_container(path, generics, true)
 			} else { false }
 		} else if let Some(syn::Type::Path(syn::TypePath { ref path, .. })) = field {
@@ -571,7 +576,7 @@ pub fn write_method_params<W: std::io::Write>(w: &mut W, sig: &syn::Signature, t
 					},
 					_ => unimplemented!(),
 				}
-				w.write(&c_type).unwrap();
+				w.write_all(&c_type).unwrap();
 			}
 		}
 	}
@@ -745,27 +750,47 @@ pub fn write_method_call_params<W: std::io::Write>(w: &mut W, sig: &syn::Signatu
 pub fn maybe_write_generics<W: std::io::Write>(w: &mut W, generics: &syn::Generics, types: &TypeResolver, concrete_lifetimes: bool) {
 	let mut gen_types = GenericTypes::new(None);
 	assert!(gen_types.learn_generics(generics, types));
-	if !generics.params.is_empty() {
-		write!(w, "<").unwrap();
-		for (idx, generic) in generics.params.iter().enumerate() {
-			match generic {
-				syn::GenericParam::Type(type_param) => {
-					write!(w, "{}", if idx != 0 { ", " } else { "" }).unwrap();
-					let type_ident = &type_param.ident;
-					types.write_c_type_in_generic_param(w, &syn::parse_quote!(#type_ident), Some(&gen_types), false);
-				},
-				syn::GenericParam::Lifetime(lt) => {
-					if concrete_lifetimes {
-						write!(w, "'static").unwrap();
-					} else {
-						write!(w, "{}'{}", if idx != 0 { ", " } else { "" }, lt.lifetime.ident).unwrap();
+	if generics.params.is_empty() { return; }
+	for generic in generics.params.iter() {
+		match generic {
+			syn::GenericParam::Type(type_param) => {
+				for bound in type_param.bounds.iter() {
+					match bound {
+						syn::TypeParamBound::Trait(t) => {
+							if let Some(trait_bound) = types.maybe_resolve_path(&t.path, None) {
+								if types.skip_path(&trait_bound) {
+									// Just hope rust deduces generic params if some bounds are skipable.
+									return;
+								}
+							}
+						}
+						_ => {},
 					}
-				},
-				_ => unimplemented!(),
+				}
 			}
+			_ => {},
+		}
+	}
+
+	write!(w, "<").unwrap();
+	for (idx, generic) in generics.params.iter().enumerate() {
+		match generic {
+			syn::GenericParam::Type(type_param) => {
+				write!(w, "{}", if idx != 0 { ", " } else { "" }).unwrap();
+				let type_ident = &type_param.ident;
+				types.write_c_type_in_generic_param(w, &syn::parse_quote!(#type_ident), Some(&gen_types), false);
+			},
+			syn::GenericParam::Lifetime(lt) => {
+				if concrete_lifetimes {
+					write!(w, "'static").unwrap();
+				} else {
+					write!(w, "{}'{}", if idx != 0 { ", " } else { "" }, lt.lifetime.ident).unwrap();
+				}
+			},
+			_ => unimplemented!(),
 		}
-		write!(w, ">").unwrap();
 	}
+	write!(w, ">").unwrap();
 }
 
 pub fn maybe_write_lifetime_generics<W: std::io::Write>(w: &mut W, generics: &syn::Generics, types: &TypeResolver) {