X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-c-bindings%2Fsrc%2Fc_types%2Fmod.rs;h=3b574073fcdd23fd100e1dcf05bf7e120159098d;hb=423f8379f53b7407632e7e5ae3dfd4aa6fab351b;hp=f706b952456bce87448e707edc32526cdddb7ade;hpb=45ad3320df3768514d968c70fc4b6a9d50028050;p=ldk-c-bindings diff --git a/lightning-c-bindings/src/c_types/mod.rs b/lightning-c-bindings/src/c_types/mod.rs index f706b95..3b57407 100644 --- a/lightning-c-bindings/src/c_types/mod.rs +++ b/lightning-c-bindings/src/c_types/mod.rs @@ -24,6 +24,8 @@ pub(crate) use core2::io::{self, Cursor, Read}; #[cfg(feature = "no-std")] use alloc::{boxed::Box, vec::Vec, string::String}; +use core::convert::TryFrom; + #[repr(C)] /// A dummy struct of which an instance must never exist. /// This corresponds to the Rust type `Infallible`, or, in unstable rust, `!` @@ -53,10 +55,12 @@ impl Into for u5 { pub struct WitnessVersion(u8); impl From for WitnessVersion { - fn from(o: address::WitnessVersion) -> Self { Self(o.into_num()) } + fn from(o: address::WitnessVersion) -> Self { Self(o.to_num()) } } impl Into for WitnessVersion { - fn into(self) -> address::WitnessVersion { address::WitnessVersion::from_num(self.0).expect("WitnessVersion objects must be in the range 0..=16") } + fn into(self) -> address::WitnessVersion { + address::WitnessVersion::try_from(self.0).expect("WitnessVersion objects must be in the range 0..=16") + } } #[derive(Clone)]