X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Fblocks.rs;h=b214445584b6f6439413f8e5c7e277b5d4af6ad1;hb=06cc796c85a4a317e55d315da9dd932d155f9f55;hp=9c404411a2719d4b979e8b920d1f0ef516e7b3c8;hpb=a82e075188fc15a103234832686915c196bfe240;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/blocks.rs b/c-bindings-gen/src/blocks.rs
index 9c40441..b214445 100644
--- a/c-bindings-gen/src/blocks.rs
+++ b/c-bindings-gen/src/blocks.rs
@@ -200,7 +200,7 @@ pub fn write_result_block<W: std::io::Write>(w: &mut W, mangled_container: &str,
 		writeln!(w, "#[no_mangle]").unwrap();
 		writeln!(w, "/// Creates a new {} which has the same data as `orig`", mangled_container).unwrap();
 		writeln!(w, "/// but with all dynamically-allocated buffers duplicated in new buffers.").unwrap();
-		writeln!(w, "pub extern \"C\" fn {}_clone(orig: &{}) -> {} {{ orig.clone() }}", mangled_container, mangled_container, mangled_container).unwrap();
+		writeln!(w, "pub extern \"C\" fn {}_clone(orig: &{}) -> {} {{ Clone::clone(&orig) }}", mangled_container, mangled_container, mangled_container).unwrap();
 	}
 }
 
@@ -301,7 +301,7 @@ pub fn write_tuple_block<W: std::io::Write>(w: &mut W, mangled_container: &str,
 		writeln!(w, "\tfn clone(&self) -> Self {{").unwrap();
 		writeln!(w, "\t\tSelf {{").unwrap();
 		for idx in 0..types.len() {
-			writeln!(w, "\t\t\t{}: self.{}.clone(),", ('a' as u8 + idx as u8) as char, ('a' as u8 + idx as u8) as char).unwrap();
+			writeln!(w, "\t\t\t{}: Clone::clone(&self.{}),", ('a' as u8 + idx as u8) as char, ('a' as u8 + idx as u8) as char).unwrap();
 		}
 		writeln!(w, "\t\t}}").unwrap();
 		writeln!(w, "\t}}").unwrap();
@@ -309,7 +309,7 @@ pub fn write_tuple_block<W: std::io::Write>(w: &mut W, mangled_container: &str,
 		writeln!(w, "#[no_mangle]").unwrap();
 		writeln!(w, "/// Creates a new tuple which has the same data as `orig`").unwrap();
 		writeln!(w, "/// but with all dynamically-allocated buffers duplicated in new buffers.").unwrap();
-		writeln!(w, "pub extern \"C\" fn {}_clone(orig: &{}) -> {} {{ orig.clone() }}", mangled_container, mangled_container, mangled_container).unwrap();
+		writeln!(w, "pub extern \"C\" fn {}_clone(orig: &{}) -> {} {{ Clone::clone(&orig) }}", mangled_container, mangled_container, mangled_container).unwrap();
 	}
 
 	writeln!(w, "/// Creates a new {} from the contained elements.", mangled_container).unwrap();
@@ -349,6 +349,9 @@ pub fn write_option_block<W: std::io::Write>(w: &mut W, mangled_container: &str,
 	writeln!(w, "\t#[allow(unused)] pub(crate) fn is_some(&self) -> bool {{").unwrap();
 	writeln!(w, "\t\tif let Self::Some(_) = self {{ true }} else {{ false }}").unwrap();
 	writeln!(w, "\t}}").unwrap();
+	writeln!(w, "\t#[allow(unused)] pub(crate) fn is_none(&self) -> bool {{").unwrap();
+	writeln!(w, "\t\t!self.is_some()").unwrap();
+	writeln!(w, "\t}}").unwrap();
 	writeln!(w, "\t#[allow(unused)] pub(crate) fn take(mut self) -> {} {{", inner_type).unwrap();
 	writeln!(w, "\t\tif let Self::Some(v) = self {{ v }} else {{ unreachable!() }}").unwrap();
 	writeln!(w, "\t}}").unwrap();
@@ -373,7 +376,7 @@ pub fn write_option_block<W: std::io::Write>(w: &mut W, mangled_container: &str,
 		writeln!(w, "#[no_mangle]").unwrap();
 		writeln!(w, "/// Creates a new {} which has the same data as `orig`", mangled_container).unwrap();
 		writeln!(w, "/// but with all dynamically-allocated buffers duplicated in new buffers.").unwrap();
-		writeln!(w, "pub extern \"C\" fn {}_clone(orig: &{}) -> {} {{ orig.clone() }}", mangled_container, mangled_container, mangled_container).unwrap();
+		writeln!(w, "pub extern \"C\" fn {}_clone(orig: &{}) -> {} {{ Clone::clone(&orig) }}", mangled_container, mangled_container, mangled_container).unwrap();
 	}
 }
 
@@ -697,7 +700,7 @@ pub fn write_method_call_params<W: std::io::Write>(w: &mut W, sig: &syn::Signatu
 				write!(w, "ret").unwrap();
 			} else if !to_c && self_segs_iter.is_some() && self_segs_iter.unwrap().next().is_none() {
 				// If we're returning "Self" (and not "Self::X"), just do it manually
-				write!(w, "{} {{ inner: Box::into_raw(Box::new(ret)), is_owned: true }}", this_type).unwrap();
+				write!(w, "{} {{ inner: ObjOps::heap_alloc(ret), is_owned: true }}", this_type).unwrap();
 			} else if to_c {
 				let new_var = types.write_from_c_conversion_new_var(w, &format_ident!("ret"), rtype, generics);
 				if new_var {
@@ -734,7 +737,7 @@ pub fn maybe_write_generics<W: std::io::Write>(w: &mut W, generics: &syn::Generi
 					for bound in type_param.bounds.iter() {
 						if let syn::TypeParamBound::Trait(trait_bound) = bound {
 							assert_simple_bound(&trait_bound);
-							write!(w, "{}{}", if idx != 0 { ", " } else { "" }, gen_types.maybe_resolve_ident(&type_param.ident).unwrap()).unwrap();
+							write!(w, "{}crate::{}", if idx != 0 { ", " } else { "" }, gen_types.maybe_resolve_ident(&type_param.ident).unwrap()).unwrap();
 							if printed_param {
 								unimplemented!("Can't print generic params that have multiple non-lifetime bounds");
 							}