X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Ftypes.rs;h=398d0241c61d3b10d524e37a602a5c0a3fc3e2aa;hb=4b3fb779db8866b0f557d9daf997d102a3330b8e;hp=f47bf9ed146397cfe80ec0e67fe8c83fb4140a4b;hpb=e1dd5fa811b8fecf0e0abdd6c7280a94489cc7b9;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index f47bf9e..398d024 100644
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -474,9 +474,12 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr
 					let crate_name_ident = format_ident!("{}", crate_name);
 					path.push(parse_quote!(#crate_name_ident));
 				} else if partial_path == "" && !dependencies.contains(&$ident) {
-					new_path = format!("{}::{}{}", crate_name, $ident, $path_suffix);
-					let crate_name_ident = format_ident!("{}", crate_name);
-					path.push(parse_quote!(#crate_name_ident));
+					new_path = format!("{}::{}{}", module_path, $ident, $path_suffix);
+					for module in module_path.split("::") {
+						path.push(syn::PathSegment { ident: syn::Ident::new(module, Span::call_site()), arguments: syn::PathArguments::None });
+					}
+					let ident_str = format_ident!("{}", $ident);
+					path.push(parse_quote!(#ident_str));
 				} else if format!("{}", $ident) == "self" {
 					let mut path_iter = partial_path.rsplitn(2, "::");
 					path_iter.next().unwrap();
@@ -814,6 +817,7 @@ 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::BigEndianScalar".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());