X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Ftypes.rs;h=598552102f3691ba9f50839ad1e6cda673700e54;hb=2951949623b40708f0c56784a5bd270993da7e31;hp=1e1bffa34b85e4fa52756d6abcd9d80936299030;hpb=f8078e127bd05d8056f13245656bcc0af8f3e08d;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index 1e1bffa..5985521 100644
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -268,7 +268,8 @@ impl<'a, 'p: 'a> GenericTypes<'a, 'p> {
 						if p.qself.is_some() { return false; }
 						if p.path.leading_colon.is_some() { return false; }
 						let mut p_iter = p.path.segments.iter();
-						if let Some(gen) = new_typed_generics.get_mut(&p_iter.next().unwrap().ident) {
+						let p_ident = &p_iter.next().unwrap().ident;
+						if let Some(gen) = new_typed_generics.get_mut(p_ident) {
 							if gen.is_some() { return false; }
 							if &format!("{}", p_iter.next().unwrap().ident) != "Target" {return false; }
 
@@ -281,7 +282,18 @@ impl<'a, 'p: 'a> GenericTypes<'a, 'p> {
 									if non_lifetimes_processed { return false; }
 									non_lifetimes_processed = true;
 									assert_simple_bound(&trait_bound);
-									*gen = Some(types.resolve_path(&trait_bound.path, None));
+									let resolved = types.resolve_path(&trait_bound.path, None);
+									let ty = syn::Type::Path(syn::TypePath {
+										qself: None, path: string_path_to_syn_path(&resolved)
+									});
+									let ref_ty = parse_quote!(&#ty);
+									if types.crate_types.traits.get(&resolved).is_some() {
+										self.default_generics.insert(p_ident, (ty, ref_ty));
+									} else {
+										self.default_generics.insert(p_ident, (ref_ty.clone(), ref_ty));
+									}
+
+									*gen = Some(resolved);
 								}
 							}
 						} else { return false; }
@@ -438,6 +450,10 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr
 					new_path = format!("{}::{}{}", crate_name, $ident, $path_suffix);
 					let crate_name_ident = format_ident!("{}", crate_name);
 					path.push(parse_quote!(#crate_name_ident));
+				} else if format!("{}", $ident) == "self" {
+					let mut path_iter = partial_path.rsplitn(2, "::");
+					path_iter.next().unwrap();
+					new_path = path_iter.next().unwrap().to_owned();
 				} else {
 					new_path = format!("{}{}{}", partial_path, $ident, $path_suffix);
 				}
@@ -452,7 +468,8 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr
 			},
 			syn::UseTree::Name(n) => {
 				push_path!(n.ident, "");
-				imports.insert(n.ident.clone(), (new_path, syn::Path { leading_colon: Some(syn::Token![::](Span::call_site())), segments: path }));
+				let imported_ident = syn::Ident::new(new_path.rsplitn(2, "::").next().unwrap(), Span::call_site());
+				imports.insert(imported_ident, (new_path, syn::Path { leading_colon: Some(syn::Token![::](Span::call_site())), segments: path }));
 			},
 			syn::UseTree::Group(g) => {
 				for i in g.items.iter() {
@@ -711,6 +728,10 @@ impl FullLibraryAST {
 fn initial_clonable_types() -> HashSet<String> {
 	let mut res = HashSet::new();
 	res.insert("crate::c_types::u5".to_owned());
+	res.insert("crate::c_types::FourBytes".to_owned());
+	res.insert("crate::c_types::TwelveBytes".to_owned());
+	res.insert("crate::c_types::SixteenBytes".to_owned());
+	res.insert("crate::c_types::TwentyBytes".to_owned());
 	res.insert("crate::c_types::ThirtyTwoBytes".to_owned());
 	res.insert("crate::c_types::SecretKey".to_owned());
 	res.insert("crate::c_types::PublicKey".to_owned());
@@ -718,8 +739,17 @@ fn initial_clonable_types() -> HashSet<String> {
 	res.insert("crate::c_types::TxOut".to_owned());
 	res.insert("crate::c_types::Signature".to_owned());
 	res.insert("crate::c_types::RecoverableSignature".to_owned());
+	res.insert("crate::c_types::Bech32Error".to_owned());
 	res.insert("crate::c_types::Secp256k1Error".to_owned());
 	res.insert("crate::c_types::IOError".to_owned());
+	res.insert("crate::c_types::Error".to_owned());
+	res.insert("crate::c_types::Str".to_owned());
+
+	// Because some types are manually-mapped to CVec_u8Z we may end up checking if its clonable
+	// before we ever get to constructing the type fully via
+	// `write_c_mangled_container_path_intern` (which will add it here too), so we have to manually
+	// add it on startup.
+	res.insert("crate::c_types::derived::CVec_u8Z".to_owned());
 	res
 }
 
@@ -1490,7 +1520,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
 				if let Some(t) = single_contained {
 					match t {
-						syn::Type::Reference(_)|syn::Type::Path(_)|syn::Type::Slice(_) => {
+						syn::Type::Reference(_)|syn::Type::Path(_)|syn::Type::Slice(_)|syn::Type::Array(_) => {
 							let mut v = Vec::new();
 							let ret_ref = self.write_empty_rust_val_check_suffix(generics, &mut v, t);
 							let s = String::from_utf8(v).unwrap();
@@ -1786,7 +1816,6 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			syn::Type::Path(p) => {
 				let resolved = self.resolve_path(&p.path, generics);
 				if let Some(arr_ty) = self.is_real_type_array(&resolved) {
-					write!(w, ".data").unwrap();
 					return self.write_empty_rust_val_check_suffix(generics, w, &arr_ty);
 				}
 				if self.crate_types.opaques.get(&resolved).is_some() {
@@ -1806,7 +1835,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			syn::Type::Array(a) => {
 				if let syn::Expr::Lit(l) = &a.len {
 					if let syn::Lit::Int(i) = &l.lit {
-						write!(w, " == [0; {}]", i.base10_digits()).unwrap();
+						write!(w, ".data == [0; {}]", i.base10_digits()).unwrap();
 						EmptyValExpectedTy::NonPointer
 					} else { unimplemented!(); }
 				} else { unimplemented!(); }