X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Fmain.rs;h=2cd466452d00f104abb1c248c7f270377b768952;hb=dda9d452eb175033fa8ecb29f2396c79a05162cb;hp=0e9a42286a1434ef6a8e3ea4f8c60356277c658e;hpb=077c4d770eaa919ed9f4aef56375abe9ef50e55a;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/main.rs b/c-bindings-gen/src/main.rs
index 0e9a422..2cd4664 100644
--- a/c-bindings-gen/src/main.rs
+++ b/c-bindings-gen/src/main.rs
@@ -351,10 +351,10 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 						// the Rust type and a flag to indicate whether deallocation needs to
 						// happen) as well as provide an Option<>al function pointer which is
 						// called when the trait method is called which allows updating on the fly.
-						write!(w, "\tpub {}: ", m.sig.ident).unwrap();
-						generated_fields.push((format!("{}", m.sig.ident), None, None));
+						write!(w, "\tpub {}: core::cell::UnsafeCell<", m.sig.ident).unwrap();
+						generated_fields.push((format!("{}", m.sig.ident), Some(("Clone::clone(unsafe { &*core::cell::UnsafeCell::get(".to_owned(), ")}).into()")), None));
 						types.write_c_type(w, &*r.elem, Some(&meth_gen_types), false);
-						writeln!(w, ",").unwrap();
+						writeln!(w, ">,").unwrap();
 						writeln!(w, "\t/// Fill in the {} field as a reference to it will be given to Rust after this returns", m.sig.ident).unwrap();
 						writeln!(w, "\t/// Note that this takes a pointer to this object, not the this_ptr like other methods do").unwrap();
 						writeln!(w, "\t/// This function pointer may be NULL if {} is filled in when this object is created and never needs updating.", m.sig.ident).unwrap();
@@ -366,9 +366,6 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 						writeln!(extra_headers, "struct LDK{};", trait_name).unwrap();
 						continue;
 					}
-					// Sadly, this currently doesn't do what we want, but it should be easy to get
-					// cbindgen to support it. See https://github.com/eqrion/cbindgen/issues/531
-					writeln!(w, "\t#[must_use]").unwrap();
 				}
 
 				let mut cpp_docs = Vec::new();
@@ -430,7 +427,7 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 				let is_clonable = types.is_clonable(s);
 				writeln!(w, "\tpub {}: crate::{},", i, s).unwrap();
 				(format!("{}", i), if !is_clonable {
-					Some(format!("crate::{}_clone_fields", s))
+					Some((format!("crate::{}_clone_fields(", s), ")"))
 				} else { None }, None)
 			});
 		}
@@ -513,7 +510,7 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 								writeln!(w, "\t\t\t(f)(&self{});", $impl_accessor).unwrap();
 								write!(w, "\t\t}}\n\t\t").unwrap();
 								$type_resolver.write_from_c_conversion_to_ref_prefix(w, &*r.elem, Some(&meth_gen_types));
-								write!(w, "self{}.{}", $impl_accessor, m.sig.ident).unwrap();
+								write!(w, "unsafe {{ &*self{}.{}.get() }}", $impl_accessor, m.sig.ident).unwrap();
 								$type_resolver.write_from_c_conversion_to_ref_suffix(w, &*r.elem, Some(&meth_gen_types));
 								writeln!(w, "\n\t}}").unwrap();
 								continue;
@@ -535,7 +532,12 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 								syn::TypeParamBound::Trait(tr) => {
 									writeln!(w, "\ttype {} = crate::{};", t.ident, $type_resolver.resolve_path(&tr.path, Some(&gen_types))).unwrap();
 									for bound in bounds_iter {
-										if let syn::TypeParamBound::Trait(_) = bound { panic!("11"); }
+										if let syn::TypeParamBound::Trait(t) = bound {
+											// We only allow for `?Sized` here.
+											if let syn::TraitBoundModifier::Maybe(_) = t.modifier {} else { panic!(); }
+											assert_eq!(t.path.segments.len(), 1);
+											assert_eq!(format!("{}", t.path.segments[0].ident), "Sized");
+										}
 									}
 									break;
 								},
@@ -557,9 +559,9 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 	writeln!(w, "\t{} {{", trait_name).unwrap();
 	writeln!(w, "\t\tthis_arg: orig.this_arg,").unwrap();
 	for (field, clone_fn, _) in generated_fields.iter() {
-		if let Some(f) = clone_fn {
+		if let Some((pfx, sfx)) = clone_fn {
 			// If the field isn't clonable, blindly assume its a trait and hope for the best.
-			writeln!(w, "\t\t{}: {}(&orig.{}),", field, f, field).unwrap();
+			writeln!(w, "\t\t{}: {}&orig.{}{},", field, pfx, field, sfx).unwrap();
 		} else {
 			writeln!(w, "\t\t{}: Clone::clone(&orig.{}),", field, field).unwrap();
 		}
@@ -600,18 +602,31 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 		(s, i, generic_args) => {
 			if let Some(supertrait) = types.crate_types.traits.get(s) {
 				let resolver = get_module_type_resolver!(s, types.crate_libs, types.crate_types);
-
-				// 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, generic_args, types, false);
-				writeln!(w, " for {} {{", trait_name).unwrap();
-
-				impl_trait_for_c!(supertrait, format!(".{}", i), &resolver, generic_args);
-				writeln!(w, "}}").unwrap();
+				macro_rules! impl_supertrait {
+					($s: expr, $supertrait: expr, $i: expr, $generic_args: expr) => {
+						let resolver = get_module_type_resolver!($s, types.crate_libs, types.crate_types);
+
+						// 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, $generic_args, types, false);
+						writeln!(w, " for {} {{", trait_name).unwrap();
+
+						impl_trait_for_c!($supertrait, format!(".{}", $i), &resolver, $generic_args);
+						writeln!(w, "}}").unwrap();
+					}
+				}
+				impl_supertrait!(s, supertrait, i, generic_args);
+				walk_supertraits!(supertrait, Some(&resolver), (
+					(s, supertrait_i, generic_args) => {
+						if let Some(supertrait) = types.crate_types.traits.get(s) {
+							impl_supertrait!(s, supertrait, format!("{}.{}", i, supertrait_i), generic_args);
+						}
+					}
+				) );
 			} else {
 				do_write_impl_trait(w, s, i, &trait_name);
 			}
@@ -790,7 +805,7 @@ fn writeln_struct<'a, 'b, W: std::io::Write>(w: &mut W, s: &'a syn::ItemStruct,
 				define_field!(('a' as u8 + idx as u8) as char, ('0' as u8 + idx as u8) as char, field);
 			}
 		}
-		_ => unimplemented!()
+		syn::Fields::Unit => {},
 	}
 
 	if all_fields_settable {
@@ -813,7 +828,7 @@ fn writeln_struct<'a, 'b, W: std::io::Write>(w: &mut W, s: &'a syn::ItemStruct,
 					types.write_c_type(w, &field.ty, Some(&gen_types), false);
 				}
 			}
-			_ => unreachable!()
+			syn::Fields::Unit => {},
 		}
 		write!(w, ") -> {} {{\n\t", struct_name).unwrap();
 		match &s.fields {
@@ -833,7 +848,7 @@ fn writeln_struct<'a, 'b, W: std::io::Write>(w: &mut W, s: &'a syn::ItemStruct,
 					}
 				}
 			},
-			_ => unreachable!()
+			syn::Fields::Unit => {},
 		}
 		write!(w, "{} {{ inner: ObjOps::heap_alloc(", struct_name).unwrap();
 		match &s.fields {
@@ -849,7 +864,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();
@@ -860,7 +876,7 @@ fn writeln_struct<'a, 'b, W: std::io::Write>(w: &mut W, s: &'a syn::ItemStruct,
 				}
 				write!(w, "\t)").unwrap();
 			},
-			_ => unreachable!()
+			syn::Fields::Unit => write!(w, "{}::{} {{}}", types.module_path, struct_name).unwrap(),
 		}
 		writeln!(w, "), is_owned: true }}\n}}").unwrap();
 	}
@@ -1032,7 +1048,7 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, w_uses: &mut HashSet<String, NonRa
 									if let syn::Type::Reference(r) = &**rtype {
 										write!(w, "\n\t\t{}{}: ", $indent, $m.sig.ident).unwrap();
 										types.write_empty_rust_val(Some(&gen_types), w, &*r.elem);
-										writeln!(w, ",\n{}\t\tset_{}: Some({}_{}_set_{}),", $indent, $m.sig.ident, ident, $trait.ident, $m.sig.ident).unwrap();
+										writeln!(w, ".into(),\n{}\t\tset_{}: Some({}_{}_set_{}),", $indent, $m.sig.ident, ident, $trait.ident, $m.sig.ident).unwrap();
 										printed = true;
 									}
 								}
@@ -1060,17 +1076,38 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, w_uses: &mut HashSet<String, NonRa
 							("core::fmt::Debug", _, _) => {},
 							(s, t, _) => {
 								if let Some(supertrait_obj) = types.crate_types.traits.get(s) {
-									writeln!(w, "\t\t{}: crate::{} {{", t, s).unwrap();
-									writeln!(w, "\t\t\tthis_arg: unsafe {{ ObjOps::untweak_ptr((*this_arg).inner) as *mut c_void }},").unwrap();
-									writeln!(w, "\t\t\tfree: None,").unwrap();
-									for item in supertrait_obj.items.iter() {
-										match item {
-											syn::TraitItem::Method(m) => {
-												write_meth!(m, supertrait_obj, "\t");
+									macro_rules! write_impl_fields {
+										($s: expr, $supertrait_obj: expr, $t: expr, $pfx: expr, $resolver: expr) => {
+											writeln!(w, "{}\t{}: crate::{} {{", $pfx, $t, $s).unwrap();
+											writeln!(w, "{}\t\tthis_arg: unsafe {{ ObjOps::untweak_ptr((*this_arg).inner) as *mut c_void }},", $pfx).unwrap();
+											writeln!(w, "{}\t\tfree: None,", $pfx).unwrap();
+											for item in $supertrait_obj.items.iter() {
+												match item {
+													syn::TraitItem::Method(m) => {
+														write_meth!(m, $supertrait_obj, $pfx);
+													},
+													_ => {},
+												}
+											}
+										walk_supertraits!($supertrait_obj, Some(&$resolver), (
+											("Clone", _, _) => {
+												writeln!(w, "{}\tcloned: Some({}_{}_cloned),", $pfx, $supertrait_obj.ident, ident).unwrap();
 											},
-											_ => {},
+											(_, _, _) => {}
+										) );
 										}
 									}
+									write_impl_fields!(s, supertrait_obj, t, "\t", types);
+
+									let resolver = get_module_type_resolver!(s, types.crate_libs, types.crate_types);
+									walk_supertraits!(supertrait_obj, Some(&resolver), (
+										(s, t, _) => {
+											if let Some(supertrait_obj) = types.crate_types.traits.get(s) {
+												write_impl_fields!(s, supertrait_obj, t, "\t\t", resolver);
+												write!(w, "\t\t\t}},\n").unwrap();
+											}
+										}
+									) );
 									write!(w, "\t\t}},\n").unwrap();
 								} else {
 									write_trait_impl_field_assign(w, s, ident);
@@ -1163,9 +1200,9 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, w_uses: &mut HashSet<String, NonRa
 										writeln!(w, "\t// This is a bit race-y in the general case, but for our specific use-cases today, we're safe").unwrap();
 										writeln!(w, "\t// Specifically, we must ensure that the first time we're called it can never be in parallel").unwrap();
 										write!(w, "\tif ").unwrap();
-										$types.write_empty_rust_val_check(Some(&meth_gen_types), w, &*r.elem, &format!("trait_self_arg.{}", $m.sig.ident));
+										$types.write_empty_rust_val_check(Some(&meth_gen_types), w, &*r.elem, &format!("unsafe {{ &*trait_self_arg.{}.get() }}", $m.sig.ident));
 										writeln!(w, " {{").unwrap();
-										writeln!(w, "\t\tunsafe {{ &mut *(trait_self_arg as *const {}  as *mut {}) }}.{} = {}_{}_{}(trait_self_arg.this_arg);", $trait.ident, $trait.ident, $m.sig.ident, ident, $trait.ident, $m.sig.ident).unwrap();
+										writeln!(w, "\t\t*unsafe {{ &mut *(&*(trait_self_arg as *const {})).{}.get() }} = {}_{}_{}(trait_self_arg.this_arg).into();", $trait.ident, $m.sig.ident, ident, $trait.ident, $m.sig.ident).unwrap();
 										writeln!(w, "\t}}").unwrap();
 										writeln!(w, "}}").unwrap();
 									}
@@ -1254,7 +1291,7 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, w_uses: &mut HashSet<String, NonRa
 
 						writeln!(w, " {{ true }} else {{ false }}\n}}").unwrap();
 					} else if path_matches_nongeneric(&trait_path.1, &["core", "hash", "Hash"]) {
-						writeln!(w, "/// Checks if two {}s contain equal inner contents.", ident).unwrap();
+						writeln!(w, "/// Generates a non-cryptographic 64-bit hash of the {}.", ident).unwrap();
 						write!(w, "#[no_mangle]\npub extern \"C\" fn {}_hash(o: &{}) -> u64 {{\n", ident, ident).unwrap();
 						if types.c_type_has_inner_from_path(&resolved_path) {
 							write!(w, "\tif o.inner.is_null() {{ return 0; }}\n").unwrap();
@@ -1359,6 +1396,7 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, w_uses: &mut HashSet<String, NonRa
 										ExportStatus::NoExport|ExportStatus::TestOnly => continue,
 										ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
 									}
+									if m.sig.asyncness.is_some() { continue; }
 									let mut meth_gen_types = gen_types.push_ctx();
 									assert!(meth_gen_types.learn_generics(&m.sig.generics, types));
 									if m.defaultness.is_some() { unimplemented!(); }
@@ -1697,7 +1735,6 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
 				write!(w, ")").unwrap();
 			}
 		}
-		if var.discriminant.is_some() { unimplemented!(); }
 		write!(&mut constr, ") -> {} {{\n\t{}::{}", e.ident, e.ident, var.ident).unwrap();
 		if let syn::Fields::Named(fields) = &var.fields {
 			writeln!(&mut constr, " {{").unwrap();