Merge pull request #14 from TheBlueMatt/main

[ldk-c-bindings] / c-bindings-gen / src / types.rs

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index edd993f9be137fa45d752dc51d01ba6538fc30eb..80ad2af4247c2657aec06b8dbf17d7a3075d71c6 100644 (file)
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -194,6 +194,7 @@ impl<'a, 'p: 'a> GenericTypes<'a, 'p> {
                                                        assert_simple_bound(&trait_bound);
                                                        if let Some(mut path) = types.maybe_resolve_path(&trait_bound.path, None) {
                                                                if types.skip_path(&path) { continue; }
+                                                               if path == "Sized" { continue; }
                                                                if non_lifetimes_processed { return false; }
                                                                non_lifetimes_processed = true;
                                                                let new_ident = if path != "std::ops::Deref" {
@@ -223,6 +224,9 @@ impl<'a, 'p: 'a> GenericTypes<'a, 'p> {
                                                        let mut non_lifetimes_processed = false;
                                                        for bound in t.bounds.iter() {
                                                                if let syn::TypeParamBound::Trait(trait_bound) = bound {
+                                                                       if let Some(id) = trait_bound.path.get_ident() {
+                                                                               if format!("{}", id) == "Sized" { continue; }
+                                                                       }
                                                                        if non_lifetimes_processed { return false; }
                                                                        non_lifetimes_processed = true;
                                                                        assert_simple_bound(&trait_bound);
@@ -509,7 +513,10 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr
                        let remaining: String = seg_iter.map(|seg| {
                                format!("::{}", seg.ident)
                        }).collect();
-                       if let Some((imp, _)) = self.imports.get(&first_seg.ident) {
+                       let first_seg_str = format!("{}", first_seg.ident);
+                       if first_seg_str == "std" {
+                               Some(first_seg_str + &remaining)
+                       } else if let Some((imp, _)) = self.imports.get(&first_seg.ident) {
                                if remaining != "" {
                                        Some(imp.clone() + &remaining)
                                } else {
@@ -771,11 +778,15 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "String" if is_ref => Some("crate::c_types::Str"),
 
                        "std::time::Duration" => Some("u64"),
+                       "std::io::Error" => Some("crate::c_types::IOError"),
 
-                       "bitcoin::secp256k1::key::PublicKey" => Some("crate::c_types::PublicKey"),
+                       "bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"
+                               => Some("crate::c_types::PublicKey"),
                        "bitcoin::secp256k1::Signature" => Some("crate::c_types::Signature"),
-                       "bitcoin::secp256k1::key::SecretKey" if is_ref  => Some("*const [u8; 32]"),
-                       "bitcoin::secp256k1::key::SecretKey" if !is_ref => Some("crate::c_types::SecretKey"),
+                       "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+                               if is_ref  => Some("*const [u8; 32]"),
+                       "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+                               if !is_ref => Some("crate::c_types::SecretKey"),
                        "bitcoin::secp256k1::Error" if !is_ref => Some("crate::c_types::Secp256k1Error"),
                        "bitcoin::blockdata::script::Script" if is_ref => Some("crate::c_types::u8slice"),
                        "bitcoin::blockdata::script::Script" if !is_ref => Some("crate::c_types::derived::CVec_u8Z"),
@@ -836,12 +847,16 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
                        "std::time::Duration" => Some("std::time::Duration::from_secs("),
 
-                       "bitcoin::secp256k1::key::PublicKey" if is_ref => Some("&"),
-                       "bitcoin::secp256k1::key::PublicKey" => Some(""),
+                       "bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"
+                               if is_ref => Some("&"),
+                       "bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"
+                               => Some(""),
                        "bitcoin::secp256k1::Signature" if is_ref => Some("&"),
                        "bitcoin::secp256k1::Signature" => Some(""),
-                       "bitcoin::secp256k1::key::SecretKey" if is_ref => Some("&::bitcoin::secp256k1::key::SecretKey::from_slice(&unsafe { *"),
-                       "bitcoin::secp256k1::key::SecretKey" if !is_ref => Some(""),
+                       "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+                               if is_ref => Some("&::bitcoin::secp256k1::key::SecretKey::from_slice(&unsafe { *"),
+                       "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+                               if !is_ref => Some(""),
                        "bitcoin::blockdata::script::Script" if is_ref => Some("&::bitcoin::blockdata::script::Script::from(Vec::from("),
                        "bitcoin::blockdata::script::Script" if !is_ref => Some("::bitcoin::blockdata::script::Script::from("),
                        "bitcoin::blockdata::transaction::Transaction" if is_ref => Some("&"),
@@ -891,10 +906,13 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
                        "std::time::Duration" => Some(")"),
 
-                       "bitcoin::secp256k1::key::PublicKey" => Some(".into_rust()"),
+                       "bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"
+                               => Some(".into_rust()"),
                        "bitcoin::secp256k1::Signature" => Some(".into_rust()"),
-                       "bitcoin::secp256k1::key::SecretKey" if !is_ref => Some(".into_rust()"),
-                       "bitcoin::secp256k1::key::SecretKey" if is_ref => Some("}[..]).unwrap()"),
+                       "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+                               if !is_ref => Some(".into_rust()"),
+                       "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+                               if is_ref => Some("}[..]).unwrap()"),
                        "bitcoin::blockdata::script::Script" if is_ref => Some(".to_slice()))"),
                        "bitcoin::blockdata::script::Script" if !is_ref => Some(".into_rust())"),
                        "bitcoin::blockdata::transaction::Transaction" => Some(".into_bitcoin()"),
@@ -963,11 +981,15 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "String" => Some(""),
 
                        "std::time::Duration" => Some(""),
+                       "std::io::Error" if !is_ref => Some("crate::c_types::IOError::from_rust("),
 
-                       "bitcoin::secp256k1::key::PublicKey" => Some("crate::c_types::PublicKey::from_rust(&"),
+                       "bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"
+                               => Some("crate::c_types::PublicKey::from_rust(&"),
                        "bitcoin::secp256k1::Signature" => Some("crate::c_types::Signature::from_rust(&"),
-                       "bitcoin::secp256k1::key::SecretKey" if is_ref  => Some(""),
-                       "bitcoin::secp256k1::key::SecretKey" if !is_ref => Some("crate::c_types::SecretKey::from_rust("),
+                       "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+                               if is_ref => Some(""),
+                       "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+                               if !is_ref => Some("crate::c_types::SecretKey::from_rust("),
                        "bitcoin::secp256k1::Error" if !is_ref => Some("crate::c_types::Secp256k1Error::from_rust("),
                        "bitcoin::blockdata::script::Script" if is_ref => Some("crate::c_types::u8slice::from_slice(&"),
                        "bitcoin::blockdata::script::Script" if !is_ref => Some(""),
@@ -1021,11 +1043,15 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "String" if is_ref => Some(".as_str().into()"),
 
                        "std::time::Duration" => Some(".as_secs()"),
+                       "std::io::Error" if !is_ref => Some(")"),
 
-                       "bitcoin::secp256k1::key::PublicKey" => Some(")"),
+                       "bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"
+                               => Some(")"),
                        "bitcoin::secp256k1::Signature" => Some(")"),
-                       "bitcoin::secp256k1::key::SecretKey" if !is_ref => Some(")"),
-                       "bitcoin::secp256k1::key::SecretKey" if is_ref => Some(".as_ref()"),
+                       "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+                               if !is_ref => Some(")"),
+                       "bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
+                               if is_ref => Some(".as_ref()"),
                        "bitcoin::secp256k1::Error" if !is_ref => Some(")"),
                        "bitcoin::blockdata::script::Script" if is_ref => Some("[..])"),
                        "bitcoin::blockdata::script::Script" if !is_ref => Some(".into_bytes().into()"),