#[derive(PartialEq, Eq, Copy, Clone)]
#[allow(non_camel_case_types)]
#[repr(C)]
-pub struct u5(u8);
+pub struct U5(u8);
-impl From<bech32::u5> for u5 {
+impl From<bech32::u5> for U5 {
fn from(o: bech32::u5) -> Self { Self(o.to_u8()) }
}
-impl Into<bech32::u5> for u5 {
+impl Into<bech32::u5> for U5 {
fn into(self) -> bech32::u5 { bech32::u5::try_from_u8(self.0).expect("u5 objects must be in the range 0..32") }
}
+/// Unsigned, 128-bit integer.
+///
+/// Because LLVM implements an incorrect ABI for 128-bit integers, a wrapper type is defined here.
+/// See https://github.com/rust-lang/rust/issues/54341 for more details.
+#[derive(PartialEq, Eq, Copy, Clone)]
+#[allow(non_camel_case_types)]
+#[repr(C)]
+pub struct U128 {
+ /// The 128-bit integer, as 16 little-endian bytes
+ pub le_bytes: [u8; 16],
+}
+
+#[no_mangle]
+/// Gets the 128-bit integer, as 16 little-endian bytes
+pub extern "C" fn U128_le_bytes(val: U128) -> SixteenBytes { SixteenBytes { data: val.le_bytes } }
+#[no_mangle]
+/// Constructs a new U128 from 16 little-endian bytes
+pub extern "C" fn U128_new(le_bytes: SixteenBytes) -> U128 { U128 { le_bytes: le_bytes.data } }
+
+impl From<u128> for U128 {
+ fn from(o: u128) -> Self { Self { le_bytes: o.to_le_bytes() } }
+}
+impl From<&mut u128> for U128 {
+ fn from(o: &mut u128) -> U128 { Self::from(*o) }
+}
+impl Into<u128> for U128 {
+ fn into(self) -> u128 { u128::from_le_bytes(self.le_bytes) }
+}
+
/// Integer in the range `0..=16`
#[derive(PartialEq, Eq, Copy, Clone)]
#[repr(C)]
}
}
+#[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
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,
_ => 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,
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(), "")
}
}
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) };
}
}
}
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) };
}
}
}