Map `io::ErrorKind` the same as `io::Error`, we only use the kind

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index 9462e988418a1387a0048624555dec99feecaaba..6564ac4756a8ba8c659c93d8b47011bbcc224916 100644 (file)
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -932,7 +932,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
                        "std::time::Duration"|"core::time::Duration" => Some("u64"),
                        "std::time::SystemTime" => Some("u64"),
-                       "std::io::Error"|"lightning::io::Error" => Some("crate::c_types::IOError"),
+                       "std::io::Error"|"lightning::io::Error"|"lightning::io::ErrorKind" => Some("crate::c_types::IOError"),
                        "core::fmt::Arguments" if is_ref => Some("crate::c_types::Str"),
 
                        "core::convert::Infallible" => Some("crate::c_types::NotConstructable"),
@@ -1017,7 +1017,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
                        "str" if is_ref => Some(""),
                        "alloc::string::String"|"String" => Some(""),
-                       "std::io::Error"|"lightning::io::Error" => Some(""),
+                       "std::io::Error"|"lightning::io::Error"|"lightning::io::ErrorKind" => Some(""),
                        // Note that we'll panic for String if is_ref, as we only have non-owned memory, we
                        // cannot create a &String.
 
@@ -1108,6 +1108,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "str" if is_ref => Some(".into_str()"),
                        "alloc::string::String"|"String" => Some(".into_string()"),
                        "std::io::Error"|"lightning::io::Error" => Some(".to_rust()"),
+                       "lightning::io::ErrorKind" => Some(".to_rust_kind()"),
 
                        "core::convert::Infallible" => Some("\")"),
 
@@ -1204,6 +1205,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "std::time::Duration"|"core::time::Duration" => Some(""),
                        "std::time::SystemTime" => Some(""),
                        "std::io::Error"|"lightning::io::Error" => Some("crate::c_types::IOError::from_rust("),
+                       "lightning::io::ErrorKind" => Some("crate::c_types::IOError::from_rust_kind("),
                        "core::fmt::Arguments" => Some("alloc::format!(\"{}\", "),
 
                        "core::convert::Infallible" => Some("panic!(\"Cannot construct an Infallible: "),
@@ -1283,7 +1285,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
                        "std::time::Duration"|"core::time::Duration" => Some(".as_secs()"),
                        "std::time::SystemTime" => Some(".duration_since(::std::time::SystemTime::UNIX_EPOCH).expect(\"Times must be post-1970\").as_secs()"),
-                       "std::io::Error"|"lightning::io::Error" => Some(")"),
+                       "std::io::Error"|"lightning::io::Error"|"lightning::io::ErrorKind" => Some(")"),
                        "core::fmt::Arguments" => Some(").into()"),
 
                        "core::convert::Infallible" => Some("\")"),

diff --git a/lightning-c-bindings/src/c_types/mod.rs b/lightning-c-bindings/src/c_types/mod.rs
index 3f8c900be02fd4d767d37eabddb21bcb859fa016..220777636c1eca44f3c043292e4d6e61dd42515b 100644 (file)
--- a/lightning-c-bindings/src/c_types/mod.rs
+++ b/lightning-c-bindings/src/c_types/mod.rs
@@ -316,8 +316,8 @@ pub enum IOError {
        UnexpectedEof,
 }
 impl IOError {
-       pub(crate) fn from_rust(err: io::Error) -> Self {
-               match err.kind() {
+       pub(crate) fn from_rust_kind(err: io::ErrorKind) -> Self {
+               match err {
                        io::ErrorKind::NotFound => IOError::NotFound,
                        io::ErrorKind::PermissionDenied => IOError::PermissionDenied,
                        io::ErrorKind::ConnectionRefused => IOError::ConnectionRefused,
@@ -339,8 +339,11 @@ impl IOError {
                        _ => IOError::Other,
                }
        }
-       pub(crate) fn to_rust(&self) -> io::Error {
-               io::Error::new(match self {
+       pub(crate) fn from_rust(err: io::Error) -> Self {
+               Self::from_rust_kind(err.kind())
+       }
+       pub(crate) fn to_rust_kind(&self) -> io::ErrorKind {
+               match self {
                        IOError::NotFound => io::ErrorKind::NotFound,
                        IOError::PermissionDenied => io::ErrorKind::PermissionDenied,
                        IOError::ConnectionRefused => io::ErrorKind::ConnectionRefused,
@@ -359,7 +362,10 @@ impl IOError {
                        IOError::Interrupted => io::ErrorKind::Interrupted,
                        IOError::Other => io::ErrorKind::Other,
                        IOError::UnexpectedEof => io::ErrorKind::UnexpectedEof,
-               }, "")
+               }
+       }
+       pub(crate) fn to_rust(&self) -> io::Error {
+               io::Error::new(self.to_rust_kind(), "")
        }
 }