Merge pull request #42 from TheBlueMatt/main

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

diff --git a/lightning-c-bindings/src/lightning/util/mod.rs b/lightning-c-bindings/src/lightning/util/mod.rs
index eb3f2a2aa28e0e4566a7d544404b5bf09d3b892b..195c8a5aa57ff1759186e884dc2a05871f554438 100644 (file)
--- a/lightning-c-bindings/src/lightning/util/mod.rs
+++ b/lightning-c-bindings/src/lightning/util/mod.rs
@@ -10,6 +10,7 @@
 
 use std::str::FromStr;
 use std::ffi::c_void;
+use core::convert::Infallible;
 use bitcoin::hashes::Hash;
 use crate::c_types::*;
 
@@ -23,6 +24,16 @@ mod fuzz_wrappers {
 
 use std::str::FromStr;
 use std::ffi::c_void;
+use core::convert::Infallible;
+use bitcoin::hashes::Hash;
+use crate::c_types::*;
+
+}
+mod ser_macros {
+
+use std::str::FromStr;
+use std::ffi::c_void;
+use core::convert::Infallible;
 use bitcoin::hashes::Hash;
 use crate::c_types::*;
 
@@ -31,6 +42,7 @@ mod byte_utils {
 
 use std::str::FromStr;
 use std::ffi::c_void;
+use core::convert::Infallible;
 use bitcoin::hashes::Hash;
 use crate::c_types::*;
 
@@ -39,6 +51,7 @@ mod chacha20 {
 
 use std::str::FromStr;
 use std::ffi::c_void;
+use core::convert::Infallible;
 use bitcoin::hashes::Hash;
 use crate::c_types::*;
 
@@ -46,6 +59,7 @@ mod real_chacha {
 
 use std::str::FromStr;
 use std::ffi::c_void;
+use core::convert::Infallible;
 use bitcoin::hashes::Hash;
 use crate::c_types::*;
 
@@ -55,6 +69,7 @@ mod zbase32 {
 
 use std::str::FromStr;
 use std::ffi::c_void;
+use core::convert::Infallible;
 use bitcoin::hashes::Hash;
 use crate::c_types::*;
 
@@ -63,6 +78,7 @@ mod poly1305 {
 
 use std::str::FromStr;
 use std::ffi::c_void;
+use core::convert::Infallible;
 use bitcoin::hashes::Hash;
 use crate::c_types::*;
 
@@ -71,6 +87,7 @@ mod chacha20poly1305rfc {
 
 use std::str::FromStr;
 use std::ffi::c_void;
+use core::convert::Infallible;
 use bitcoin::hashes::Hash;
 use crate::c_types::*;
 
@@ -78,6 +95,7 @@ mod real_chachapoly {
 
 use std::str::FromStr;
 use std::ffi::c_void;
+use core::convert::Infallible;
 use bitcoin::hashes::Hash;
 use crate::c_types::*;
 
@@ -87,6 +105,7 @@ mod transaction_utils {
 
 use std::str::FromStr;
 use std::ffi::c_void;
+use core::convert::Infallible;
 use bitcoin::hashes::Hash;
 use crate::c_types::*;
 
@@ -95,14 +114,7 @@ mod scid_utils {
 
 use std::str::FromStr;
 use std::ffi::c_void;
-use bitcoin::hashes::Hash;
-use crate::c_types::*;
-
-}
-mod ser_macros {
-
-use std::str::FromStr;
-use std::ffi::c_void;
+use core::convert::Infallible;
 use bitcoin::hashes::Hash;
 use crate::c_types::*;
 
@@ -111,6 +123,7 @@ mod macro_logger {
 
 use std::str::FromStr;
 use std::ffi::c_void;
+use core::convert::Infallible;
 use bitcoin::hashes::Hash;
 use crate::c_types::*;