X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Ftypes.rs;h=7e4eee3798fc8643caf2d707a37eefbeee8ddf1b;hb=07fe5cf2e1b469125e8fdb97175593399888485b;hp=2cb93690095247845687370e2011220b3dda945f;hpb=6c95131720d1d390bf006f5160dcf4aa878fa4f0;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index 2cb9369..7e4eee3 100644
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -513,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 {
@@ -775,6 +778,7 @@ 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::Signature" => Some("crate::c_types::Signature"),
@@ -967,6 +971,7 @@ 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::Signature" => Some("crate::c_types::Signature::from_rust(&"),
@@ -1025,6 +1030,7 @@ 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::Signature" => Some(")"),