X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Fmain.rs;h=9693e3d560a04575cf51863ec180ce1d37956434;hb=3559b05697ad226c82994bfb6b3d09657d21bbe2;hp=4d0bf586d8eba5f09b3c679e5fcf2a66d48be853;hpb=abc2e0d8b1b385b820387da354bfe3694d433bb2;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/main.rs b/c-bindings-gen/src/main.rs
index 4d0bf58..9693e3d 100644
--- a/c-bindings-gen/src/main.rs
+++ b/c-bindings-gen/src/main.rs
@@ -280,10 +280,9 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 						writeln!(w, "\tpub set_{}: Option<extern \"C\" fn(&{})>,", m.sig.ident, trait_name).unwrap();
 						generated_fields.push((format!("set_{}", m.sig.ident), true));
 						// Note that cbindgen will now generate
-						// typedef struct Thing {..., set_thing: (const Thing*), ...} Thing;
+						// typedef struct Thing {..., set_thing: (const struct Thing*), ...} Thing;
 						// which does not compile since Thing is not defined before it is used.
 						writeln!(extra_headers, "struct LDK{};", trait_name).unwrap();
-						writeln!(extra_headers, "typedef struct LDK{} LDK{};", trait_name, trait_name).unwrap();
 						continue;
 					}
 					// Sadly, this currently doesn't do what we want, but it should be easy to get
@@ -317,7 +316,6 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 		("std::cmp::Eq", _)|("core::cmp::Eq", _) => {
 			writeln!(w, "\t/// Checks if two objects are equal given this object's this_arg pointer and another object.").unwrap();
 			writeln!(w, "\tpub eq: extern \"C\" fn (this_arg: *const c_void, other_arg: &{}) -> bool,", trait_name).unwrap();
-			writeln!(extra_headers, "typedef struct LDK{} LDK{};", trait_name, trait_name).unwrap();
 			generated_fields.push(("eq".to_owned(), true));
 		},
 		("std::hash::Hash", _)|("core::hash::Hash", _) => {
@@ -450,11 +448,11 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 		}
 	}
 
+	writeln!(w, "unsafe impl Send for {} {{}}", trait_name).unwrap();
+	writeln!(w, "unsafe impl Sync for {} {{}}", trait_name).unwrap();
 
 	// Implement supertraits for the C-mapped struct.
 	walk_supertraits!(t, Some(&types), (
-		("Send", _) => writeln!(w, "unsafe impl Send for {} {{}}", trait_name).unwrap(),
-		("Sync", _) => writeln!(w, "unsafe impl Sync for {} {{}}", trait_name).unwrap(),
 		("std::cmp::Eq", _)|("core::cmp::Eq", _) => {
 			writeln!(w, "impl std::cmp::Eq for {} {{}}", trait_name).unwrap();
 			writeln!(w, "impl std::cmp::PartialEq for {} {{", trait_name).unwrap();
@@ -464,6 +462,7 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 			writeln!(w, "impl std::hash::Hash for {} {{", trait_name).unwrap();
 			writeln!(w, "\tfn hash<H: std::hash::Hasher>(&self, hasher: &mut H) {{ hasher.write_u64((self.hash)(self.this_arg)) }}\n}}").unwrap();
 		},
+		("Send", _) => {}, ("Sync", _) => {},
 		("Clone", _) => {
 			writeln!(w, "#[no_mangle]").unwrap();
 			writeln!(w, "/// Creates a copy of a {}", trait_name).unwrap();
@@ -495,11 +494,6 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 				writeln!(w, "impl {} for {} {{", s, trait_name).unwrap();
 				impl_trait_for_c!(supertrait, format!(".{}", i), &resolver);
 				writeln!(w, "}}").unwrap();
-				walk_supertraits!(supertrait, Some(&types), (
-					("Send", _) => writeln!(w, "unsafe impl Send for {} {{}}", trait_name).unwrap(),
-					("Sync", _) => writeln!(w, "unsafe impl Sync for {} {{}}", trait_name).unwrap(),
-					_ => unimplemented!()
-				) );
 			} else {
 				do_write_impl_trait(w, s, i, &trait_name);
 			}
@@ -949,6 +943,52 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
 						write!(w, "\t{} {{ inner: Box::into_raw(Box::new(Default::default())), is_owned: true }}\n", ident).unwrap();
 						write!(w, "}}\n").unwrap();
 					} else if path_matches_nongeneric(&trait_path.1, &["core", "cmp", "PartialEq"]) {
+					} else if path_matches_nongeneric(&trait_path.1, &["core", "cmp", "Eq"]) {
+						writeln!(w, "/// Checks if two {}s contain equal inner contents.", ident).unwrap();
+						writeln!(w, "/// This ignores pointers and is_owned flags and looks at the values in fields.").unwrap();
+						if types.c_type_has_inner_from_path(&resolved_path) {
+							writeln!(w, "/// Two objects with NULL inner values will be considered \"equal\" here.").unwrap();
+						}
+						write!(w, "#[no_mangle]\npub extern \"C\" fn {}_eq(a: &{}, b: &{}) -> bool {{\n", ident, ident, ident).unwrap();
+						if types.c_type_has_inner_from_path(&resolved_path) {
+							write!(w, "\tif a.inner == b.inner {{ return true; }}\n").unwrap();
+							write!(w, "\tif a.inner.is_null() || b.inner.is_null() {{ return false; }}\n").unwrap();
+						}
+
+						let path = &p.path;
+						let ref_type: syn::Type = syn::parse_quote!(&#path);
+						assert!(!types.write_to_c_conversion_new_var(w, &format_ident!("a"), &*i.self_ty, Some(&gen_types), false), "We don't support new var conversions when comparing equality");
+
+						write!(w, "\tif ").unwrap();
+						types.write_from_c_conversion_prefix(w, &ref_type, Some(&gen_types));
+						write!(w, "a").unwrap();
+						types.write_from_c_conversion_suffix(w, &ref_type, Some(&gen_types));
+						write!(w, " == ").unwrap();
+						types.write_from_c_conversion_prefix(w, &ref_type, Some(&gen_types));
+						write!(w, "b").unwrap();
+						types.write_from_c_conversion_suffix(w, &ref_type, Some(&gen_types));
+
+						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();
+						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();
+						}
+
+						let path = &p.path;
+						let ref_type: syn::Type = syn::parse_quote!(&#path);
+						assert!(!types.write_to_c_conversion_new_var(w, &format_ident!("a"), &*i.self_ty, Some(&gen_types), false), "We don't support new var conversions when comparing equality");
+
+						writeln!(w, "\t// Note that we'd love to use std::collections::hash_map::DefaultHasher but it's not in core").unwrap();
+						writeln!(w, "\t#[allow(deprecated)]").unwrap();
+						writeln!(w, "\tlet mut hasher = core::hash::SipHasher::new();").unwrap();
+						write!(w, "\tstd::hash::Hash::hash(").unwrap();
+						types.write_from_c_conversion_prefix(w, &ref_type, Some(&gen_types));
+						write!(w, "o").unwrap();
+						types.write_from_c_conversion_suffix(w, &ref_type, Some(&gen_types));
+						writeln!(w, ", &mut hasher);").unwrap();
+						writeln!(w, "\tstd::hash::Hasher::finish(&hasher)\n}}").unwrap();
 					} else if (path_matches_nongeneric(&trait_path.1, &["core", "clone", "Clone"]) || path_matches_nongeneric(&trait_path.1, &["Clone"])) &&
 							types.c_type_has_inner_from_path(&resolved_path) {
 						writeln!(w, "impl Clone for {} {{", ident).unwrap();