X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Fblocks.rs;h=28f30026ed0810ef0263be3a8b4636a234d59b54;hb=5266836421190e74f893a3f9de5182057c2bd9b8;hp=b2f952be5fa1cb3fdcb6f51a6d677d7680f59d60;hpb=dd5bf474af6c806b20c26f4f2b751f3226a94dfd;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/blocks.rs b/c-bindings-gen/src/blocks.rs
index b2f952b..28f3002 100644
--- a/c-bindings-gen/src/blocks.rs
+++ b/c-bindings-gen/src/blocks.rs
@@ -61,7 +61,7 @@ pub fn write_result_block<W: std::io::Write>(w: &mut W, mangled_container: &str,
 		writeln!(w, "\tpub result: *mut {},", ok_type).unwrap();
 	} else {
 		writeln!(w, "\t/// Note that this value is always NULL, as there are no contents in the OK variant").unwrap();
-		writeln!(w, "\tpub result: *mut std::ffi::c_void,").unwrap();
+		writeln!(w, "\tpub result: *mut core::ffi::c_void,").unwrap();
 	}
 	if err_type != "()" {
 		writeln!(w, "\t/// A pointer to the contents in the error state.").unwrap();
@@ -69,7 +69,7 @@ pub fn write_result_block<W: std::io::Write>(w: &mut W, mangled_container: &str,
 		writeln!(w, "\tpub err: *mut {},", err_type).unwrap();
 	} else {
 		writeln!(w, "\t/// Note that this value is always NULL, as there are no contents in the Err variant").unwrap();
-		writeln!(w, "\tpub err: *mut std::ffi::c_void,").unwrap();
+		writeln!(w, "\tpub err: *mut core::ffi::c_void,").unwrap();
 	}
 	writeln!(w, "}}").unwrap();
 	writeln!(w, "#[repr(C)]").unwrap();
@@ -97,7 +97,7 @@ pub fn write_result_block<W: std::io::Write>(w: &mut W, mangled_container: &str,
 	if ok_type != "()" {
 		writeln!(w, "\t\t\tresult: Box::into_raw(Box::new(o)),").unwrap();
 	} else {
-		writeln!(w, "\t\t\tresult: std::ptr::null_mut(),").unwrap();
+		writeln!(w, "\t\t\tresult: core::ptr::null_mut(),").unwrap();
 	}
 	writeln!(w, "\t\t}},").unwrap();
 	writeln!(w, "\t\tresult_ok: true,").unwrap();
@@ -117,7 +117,7 @@ pub fn write_result_block<W: std::io::Write>(w: &mut W, mangled_container: &str,
 	if err_type != "()" {
 		writeln!(w, "\t\t\terr: Box::into_raw(Box::new(e)),").unwrap();
 	} else {
-		writeln!(w, "\t\t\terr: std::ptr::null_mut(),").unwrap();
+		writeln!(w, "\t\t\terr: core::ptr::null_mut(),").unwrap();
 	}
 	writeln!(w, "\t\t}},").unwrap();
 	writeln!(w, "\t\tresult_ok: false,").unwrap();
@@ -156,22 +156,22 @@ pub fn write_result_block<W: std::io::Write>(w: &mut W, mangled_container: &str,
 	writeln!(w, "\t\tlet contents = if o.result_ok {{").unwrap();
 	if ok_type != "()" {
 		writeln!(w, "\t\t\tlet result = unsafe {{ o.contents.result }};").unwrap();
-		writeln!(w, "\t\t\tunsafe {{ o.contents.result = std::ptr::null_mut() }};").unwrap();
+		writeln!(w, "\t\t\tunsafe {{ o.contents.result = core::ptr::null_mut() }};").unwrap();
 		writeln!(w, "\t\t\t{}Ptr {{ result }}", mangled_container).unwrap();
 	} else {
 		writeln!(w, "\t\t\tlet _ = unsafe {{ Box::from_raw(o.contents.result) }};").unwrap();
-		writeln!(w, "\t\t\to.contents.result = std::ptr::null_mut();").unwrap();
-		writeln!(w, "\t\t\t{}Ptr {{ result: std::ptr::null_mut() }}", mangled_container).unwrap();
+		writeln!(w, "\t\t\to.contents.result = core::ptr::null_mut();").unwrap();
+		writeln!(w, "\t\t\t{}Ptr {{ result: core::ptr::null_mut() }}", mangled_container).unwrap();
 	}
 	writeln!(w, "\t\t}} else {{").unwrap();
 	if err_type != "()" {
 		writeln!(w, "\t\t\tlet err = unsafe {{ o.contents.err }};").unwrap();
-		writeln!(w, "\t\t\tunsafe {{ o.contents.err = std::ptr::null_mut(); }}").unwrap();
+		writeln!(w, "\t\t\tunsafe {{ o.contents.err = core::ptr::null_mut(); }}").unwrap();
 		writeln!(w, "\t\t\t{}Ptr {{ err }}", mangled_container).unwrap();
 	} else {
 		writeln!(w, "\t\t\tlet _ = unsafe {{ Box::from_raw(o.contents.err) }};").unwrap();
-		writeln!(w, "\t\t\to.contents.err = std::ptr::null_mut();").unwrap();
-		writeln!(w, "\t\t\t{}Ptr {{ err: std::ptr::null_mut() }}", mangled_container).unwrap();
+		writeln!(w, "\t\t\to.contents.err = core::ptr::null_mut();").unwrap();
+		writeln!(w, "\t\t\t{}Ptr {{ err: core::ptr::null_mut() }}", mangled_container).unwrap();
 	}
 	writeln!(w, "\t\t}};").unwrap();
 	writeln!(w, "\t\tSelf {{").unwrap();
@@ -189,7 +189,7 @@ pub fn write_result_block<W: std::io::Write>(w: &mut W, mangled_container: &str,
 		if ok_type != "()" {
 			writeln!(w, "\t\t\t\tresult: Box::into_raw(Box::new(<{}>::clone(unsafe {{ &*self.contents.result }})))", ok_type).unwrap();
 		} else {
-			writeln!(w, "\t\t\t\tresult: std::ptr::null_mut()").unwrap();
+			writeln!(w, "\t\t\t\tresult: core::ptr::null_mut()").unwrap();
 		}
 		writeln!(w, "\t\t\t}} }}").unwrap();
 		writeln!(w, "\t\t}} else {{").unwrap();
@@ -197,7 +197,7 @@ pub fn write_result_block<W: std::io::Write>(w: &mut W, mangled_container: &str,
 		if err_type != "()" {
 			writeln!(w, "\t\t\t\terr: Box::into_raw(Box::new(<{}>::clone(unsafe {{ &*self.contents.err }})))", err_type).unwrap();
 		} else {
-			writeln!(w, "\t\t\t\terr: std::ptr::null_mut()").unwrap();
+			writeln!(w, "\t\t\t\terr: core::ptr::null_mut()").unwrap();
 		}
 		writeln!(w, "\t\t\t}} }}").unwrap();
 		writeln!(w, "\t\t}}").unwrap();
@@ -226,13 +226,13 @@ pub fn write_vec_block<W: std::io::Write>(w: &mut W, mangled_container: &str, in
 	writeln!(w, "impl {} {{", mangled_container).unwrap();
 	writeln!(w, "\t#[allow(unused)] pub(crate) fn into_rust(&mut self) -> Vec<{}> {{", inner_type).unwrap();
 	writeln!(w, "\t\tif self.datalen == 0 {{ return Vec::new(); }}").unwrap();
-	writeln!(w, "\t\tlet ret = unsafe {{ Box::from_raw(std::slice::from_raw_parts_mut(self.data, self.datalen)) }}.into();").unwrap();
-	writeln!(w, "\t\tself.data = std::ptr::null_mut();").unwrap();
+	writeln!(w, "\t\tlet ret = unsafe {{ Box::from_raw(core::slice::from_raw_parts_mut(self.data, self.datalen)) }}.into();").unwrap();
+	writeln!(w, "\t\tself.data = core::ptr::null_mut();").unwrap();
 	writeln!(w, "\t\tself.datalen = 0;").unwrap();
 	writeln!(w, "\t\tret").unwrap();
 	writeln!(w, "\t}}").unwrap();
 	writeln!(w, "\t#[allow(unused)] pub(crate) fn as_slice(&self) -> &[{}] {{", inner_type).unwrap();
-	writeln!(w, "\t\tunsafe {{ std::slice::from_raw_parts_mut(self.data, self.datalen) }}").unwrap();
+	writeln!(w, "\t\tunsafe {{ core::slice::from_raw_parts_mut(self.data, self.datalen) }}").unwrap();
 	writeln!(w, "\t}}").unwrap();
 	writeln!(w, "}}").unwrap();
 
@@ -250,7 +250,7 @@ pub fn write_vec_block<W: std::io::Write>(w: &mut W, mangled_container: &str, in
 	writeln!(w, "impl Drop for {} {{", mangled_container).unwrap();
 	writeln!(w, "\tfn drop(&mut self) {{").unwrap();
 	writeln!(w, "\t\tif self.datalen == 0 {{ return; }}").unwrap();
-	writeln!(w, "\t\tunsafe {{ Box::from_raw(std::slice::from_raw_parts_mut(self.data, self.datalen)) }};").unwrap();
+	writeln!(w, "\t\tlet _ = unsafe {{ Box::from_raw(core::slice::from_raw_parts_mut(self.data, self.datalen)) }};").unwrap();
 	writeln!(w, "\t}}").unwrap();
 	writeln!(w, "}}").unwrap();
 	if clonable {
@@ -258,7 +258,7 @@ pub fn write_vec_block<W: std::io::Write>(w: &mut W, mangled_container: &str, in
 		writeln!(w, "\tfn clone(&self) -> Self {{").unwrap();
 		writeln!(w, "\t\tlet mut res = Vec::new();").unwrap();
 		writeln!(w, "\t\tif self.datalen == 0 {{ return Self::from(res); }}").unwrap();
-		writeln!(w, "\t\tres.extend_from_slice(unsafe {{ std::slice::from_raw_parts_mut(self.data, self.datalen) }});").unwrap();
+		writeln!(w, "\t\tres.extend_from_slice(unsafe {{ core::slice::from_raw_parts_mut(self.data, self.datalen) }});").unwrap();
 		writeln!(w, "\t\tSelf::from(res)").unwrap();
 		writeln!(w, "\t}}").unwrap();
 		writeln!(w, "}}").unwrap();
@@ -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();
 			}
 		}
 	}
@@ -742,30 +747,58 @@ 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, types: &TypeResolver, concrete_lifetimes: bool) {
+pub fn maybe_write_generics<W: std::io::Write>(w: &mut W, generics: &syn::Generics, generics_impld: &syn::PathArguments, 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;
+				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);
+				} else {
+					if let 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);
+						}
+					}
+				}
+			},
+			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) {