X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-c-bindings;a=blobdiff_plain;f=lightning-c-bindings%2Fsrc%2Fc_types%2Fmod.rs;h=f31d55bd1b2c7d9ec67f30552f0036d27e5b28a6;hp=e5449a5a934281953c977bd3ddc560e448989ef8;hb=11cd55b6baf2c94a44f0cd24774f0d822ff90d66;hpb=c434cf955420dcbc9788db83ec00be50ce5daa6a

diff --git a/lightning-c-bindings/src/c_types/mod.rs b/lightning-c-bindings/src/c_types/mod.rs
index e5449a5..f31d55b 100644
--- a/lightning-c-bindings/src/c_types/mod.rs
+++ b/lightning-c-bindings/src/c_types/mod.rs
@@ -20,6 +20,8 @@ use core::ffi::c_void;
 pub(crate) use std::io::{self, Cursor, Read};
 #[cfg(feature = "no-std")]
 pub(crate) use core2::io::{self, Cursor, Read};
+#[cfg(feature = "no-std")]
+use alloc::{boxed::Box, vec::Vec, string::String};
 
 #[repr(C)]
 /// A dummy struct of which an instance must never exist.
@@ -65,6 +67,7 @@ impl PublicKey {
 }
 
 #[repr(C)]
+#[derive(Clone)]
 /// Represents a valid secp256k1 secret key serialized as a 32 byte array.
 pub struct SecretKey {
 	/// The bytes of the secret key
@@ -192,6 +195,7 @@ pub enum IOError {
 	Other,
 	UnexpectedEof,
 }
+#[cfg(feature = "std")]
 impl IOError {
 	pub(crate) fn from_rust(err: std::io::Error) -> Self {
 		match err.kind() {
@@ -276,7 +280,7 @@ impl Transaction {
 	}
 	pub(crate) fn into_bitcoin(&self) -> BitcoinTransaction {
 		if self.datalen == 0 { panic!("0-length buffer can never represent a valid Transaction"); }
-		::bitcoin::consensus::encode::deserialize(unsafe { std::slice::from_raw_parts(self.data, self.datalen) }).unwrap()
+		::bitcoin::consensus::encode::deserialize(unsafe { core::slice::from_raw_parts(self.data, self.datalen) }).unwrap()
 	}
 	pub(crate) fn from_bitcoin(btc: &BitcoinTransaction) -> Self {
 		let vec = ::bitcoin::consensus::encode::serialize(btc);
@@ -292,7 +296,7 @@ impl Drop for Transaction {
 }
 impl Clone for Transaction {
 	fn clone(&self) -> Self {
-		let sl = unsafe { std::slice::from_raw_parts(self.data, self.datalen) };
+		let sl = unsafe { core::slice::from_raw_parts(self.data, self.datalen) };
 		let mut v = Vec::new();
 		v.extend_from_slice(&sl);
 		Self::from_vec(v)
@@ -369,7 +373,7 @@ impl u8slice {
 	}
 	pub(crate) fn to_slice(&self) -> &[u8] {
 		if self.datalen == 0 { return &[]; }
-		unsafe { std::slice::from_raw_parts(self.data, self.datalen) }
+		unsafe { core::slice::from_raw_parts(self.data, self.datalen) }
 	}
 	pub(crate) fn to_reader<'a>(&'a self) -> Cursor<&'a [u8]> {
 		let sl = self.to_slice();
@@ -467,20 +471,20 @@ impl Into<Str> for &mut &'static str {
 impl Str {
 	pub(crate) fn into_str(&self) -> &'static str {
 		if self.len == 0 { return ""; }
-		std::str::from_utf8(unsafe { std::slice::from_raw_parts(self.chars, self.len) }).unwrap()
+		core::str::from_utf8(unsafe { core::slice::from_raw_parts(self.chars, self.len) }).unwrap()
 	}
 	pub(crate) fn into_string(mut self) -> String {
 		let bytes = if self.len == 0 {
 			Vec::new()
 		} else if self.chars_is_owned {
 			let ret = unsafe {
-				Box::from_raw(std::slice::from_raw_parts_mut(unsafe { self.chars as *mut u8 }, self.len))
+				Box::from_raw(core::slice::from_raw_parts_mut(unsafe { self.chars as *mut u8 }, self.len))
 			}.into();
 			self.chars_is_owned = false;
 			ret
 		} else {
 			let mut ret = Vec::with_capacity(self.len);
-			ret.extend_from_slice(unsafe { std::slice::from_raw_parts(self.chars, self.len) });
+			ret.extend_from_slice(unsafe { core::slice::from_raw_parts(self.chars, self.len) });
 			ret
 		};
 		String::from_utf8(bytes).unwrap()
@@ -562,20 +566,23 @@ pub(crate) trait TakePointer<T> {
 impl<T> TakePointer<*const T> for *const T {
 	fn take_ptr(&mut self) -> *const T {
 		let ret = *self;
-		*self = std::ptr::null();
+		*self = core::ptr::null();
 		ret
 	}
 }
 impl<T> TakePointer<*mut T> for *mut T {
 	fn take_ptr(&mut self) -> *mut T {
 		let ret = *self;
-		*self = std::ptr::null_mut();
+		*self = core::ptr::null_mut();
 		ret
 	}
 }
 
 
 pub(crate) mod ObjOps {
+	#[cfg(feature = "no-std")]
+	use alloc::boxed::Box;
+
 	#[inline]
 	#[must_use = "returns new dangling pointer"]
 	pub(crate) fn heap_alloc<T>(obj: T) -> *mut T {
@@ -642,17 +649,17 @@ impl<T> SmartPtr<T> {
 		Self { ptr: Box::into_raw(Box::new(o)) }
 	}
 	pub(crate) fn null() -> Self {
-		Self { ptr: std::ptr::null_mut() }
+		Self { ptr: core::ptr::null_mut() }
 	}
 }
 impl<T> Drop for SmartPtr<T> {
 	fn drop(&mut self) {
-		if self.ptr != std::ptr::null_mut() {
+		if self.ptr != core::ptr::null_mut() {
 			unsafe { Box::from_raw(self.ptr); }
 		}
 	}
 }
-impl<T> std::ops::Deref for SmartPtr<T> {
+impl<T> core::ops::Deref for SmartPtr<T> {
 	type Target = *mut T;
 	fn deref(&self) -> &*mut T {
 		&self.ptr