X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Fmain.rs;h=9d6f9cfeadad7717594a5d878d19e2a0ac2a1af2;hb=a89709db0fdd79f00e3a6c9bede01ec2089255fb;hp=8e3962d5da2f133fcb4068721e88d3f29fff27b1;hpb=76de2ac42e848418502e882a02b0b97204d35526;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/main.rs b/c-bindings-gen/src/main.rs
index 8e3962d..9d6f9cf 100644
--- a/c-bindings-gen/src/main.rs
+++ b/c-bindings-gen/src/main.rs
@@ -646,7 +646,7 @@ fn writeln_struct<'a, 'b, W: std::io::Write>(w: &mut W, s: &'a syn::ItemStruct,
 		let mut self_path_segs = syn::punctuated::Punctuated::new();
 		self_path_segs.push(s.ident.clone().into());
 		let self_path = syn::Path { leading_colon: None, segments: self_path_segs};
-		let mut gen_types = GenericTypes::new(Some((types.resolve_path(&self_path, None), &self_path)));
+		let mut gen_types = GenericTypes::new(Some(types.resolve_path(&self_path, None)));
 		assert!(gen_types.learn_generics(&s.generics, types));
 
 		let mut all_fields_settable = true;
@@ -769,7 +769,7 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
 		if p.qself.is_some() { unimplemented!(); }
 		if let Some(ident) = single_ident_generic_path_to_ident(&p.path) {
 			if let Some(resolved_path) = types.maybe_resolve_non_ignored_ident(&ident) {
-				let mut gen_types = GenericTypes::new(Some((resolved_path.clone(), &p.path)));
+				let mut gen_types = GenericTypes::new(Some(resolved_path.clone()));
 				if !gen_types.learn_generics(&i.generics, types) {
 					eprintln!("Not implementing anything for impl {} due to not understood generics", ident);
 					return;
@@ -1853,7 +1853,8 @@ fn walk_ast<'a>(ast_storage: &'a FullLibraryAST, crate_types: &mut CrateTypes<'a
 				syn::Item::Impl(i) => {
 					if let &syn::Type::Path(ref p) = &*i.self_ty {
 						if let Some(trait_path) = i.trait_.as_ref() {
-							if path_matches_nongeneric(&trait_path.1, &["core", "clone", "Clone"]) {
+							if path_matches_nongeneric(&trait_path.1, &["core", "clone", "Clone"]) ||
+							   path_matches_nongeneric(&trait_path.1, &["Clone"]) {
 								if let Some(full_path) = import_resolver.maybe_resolve_path(&p.path, None) {
 									crate_types.set_clonable("crate::".to_owned() + &full_path);
 								}
@@ -1904,6 +1905,9 @@ fn main() {
 	writeln!(header_file, "#endif").unwrap();
 	writeln!(cpp_header_file, "#include <string.h>\nnamespace LDK {{").unwrap();
 
+	// Write a few manually-defined types into the C++ header file
+	write_cpp_wrapper(&mut cpp_header_file, "Str", true, None);
+
 	// First parse the full crate's ASTs, caching them so that we can hold references to the AST
 	// objects in other datastructures:
 	let mut lib_src = String::new();