Make rustc stop complaining about unused `Box::from_raw`s

[ldk-c-bindings] / lightning-c-bindings / src / c_types / mod.rs

diff --git a/lightning-c-bindings/src/c_types/mod.rs b/lightning-c-bindings/src/c_types/mod.rs
index 0c46581f20266e5abe23dfab1e1d151de0d2b40d..71616375aabfc10a5784650328cf0803f45c24f1 100644 (file)
--- a/lightning-c-bindings/src/c_types/mod.rs
+++ b/lightning-c-bindings/src/c_types/mod.rs
@@ -166,6 +166,12 @@ impl BigEndianScalar {
        }
 }
 
+#[no_mangle]
+/// Convenience function for constructing a new BigEndianScalar
+pub extern "C" fn BigEndianScalar_new(big_endian_bytes: ThirtyTwoBytes) -> BigEndianScalar {
+       BigEndianScalar { big_endian_bytes: big_endian_bytes.data }
+}
+
 #[repr(C)]
 #[derive(Copy, Clone)]
 /// Represents an error returned from libsecp256k1 during validation of some secp256k1 data
@@ -310,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,
@@ -333,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,
@@ -353,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(), "")
        }
 }
 
@@ -664,10 +676,10 @@ impl<O, E> Drop for CResultTempl<O, E> {
        fn drop(&mut self) {
                if self.result_ok {
                        if unsafe { !self.contents.result.is_null() } {
-                               unsafe { Box::from_raw(self.contents.result) };
+                               let _ = unsafe { Box::from_raw(self.contents.result) };
                        }
                } else if unsafe { !self.contents.err.is_null() } {
-                       unsafe { Box::from_raw(self.contents.err) };
+                       let _ = unsafe { Box::from_raw(self.contents.err) };
                }
        }
 }
@@ -768,7 +780,7 @@ impl<T> SmartPtr<T> {
 impl<T> Drop for SmartPtr<T> {
        fn drop(&mut self) {
                if self.ptr != core::ptr::null_mut() {
-                       unsafe { Box::from_raw(self.ptr); }
+                       let _ = unsafe { Box::from_raw(self.ptr) };
                }
        }
 }