X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Fblocks.rs;h=88172722efbda088aef61443fba43e2af6515e07;hb=5eebd45b471833805e81ad4c23ec93d7711e0a23;hp=bbb41e09f5df03adab603bbb9cfc701503e8060d;hpb=d7aaec88584beeb1cece72259f68382f2a729440;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/blocks.rs b/c-bindings-gen/src/blocks.rs
index bbb41e0..8817272 100644
--- a/c-bindings-gen/src/blocks.rs
+++ b/c-bindings-gen/src/blocks.rs
@@ -11,7 +11,9 @@
 
 use std::fs::File;
 use std::io::Write;
-use proc_macro2::{TokenTree, Span};
+
+use proc_macro2::TokenTree;
+use quote::format_ident;
 
 use crate::types::*;
 
@@ -440,14 +442,16 @@ pub fn write_method_params<W: std::io::Write>(w: &mut W, sig: &syn::Signature, t
 	for inp in sig.inputs.iter() {
 		match inp {
 			syn::FnArg::Receiver(recv) => {
-				if !recv.attrs.is_empty() || recv.reference.is_none() { unimplemented!(); }
-				write!(w, "this_arg: {}{}",
-					match (self_ptr, recv.mutability.is_some()) {
-						(true, true) => "*mut ",
-						(true, false) => "*const ",
-						(false, true) => "&mut ",
-						(false, false) => "&",
-					}, this_param).unwrap();
+				if !recv.attrs.is_empty() { unimplemented!(); }
+				write!(w, "{}this_arg: {}{}", if recv.reference.is_none() { "mut " } else { "" },
+					if recv.reference.is_some() {
+						match (self_ptr, recv.mutability.is_some()) {
+							(true, true) => "*mut ",
+							(true, false) => "*const ",
+							(false, true) => "&mut ",
+							(false, false) => "&",
+						}
+					} else { "" }, this_param).unwrap();
 				assert!(first_arg);
 				first_arg = false;
 			},
@@ -486,12 +490,7 @@ pub fn write_method_params<W: std::io::Write>(w: &mut W, sig: &syn::Signature, t
 					return;
 				}
 			}
-			if let syn::Type::Reference(r) = &**rtype {
-				// We can't return a reference, cause we allocate things on the stack.
-				types.write_c_type(w, &*r.elem, generics, true);
-			} else {
-				types.write_c_type(w, &*rtype, generics, true);
-			}
+			types.write_c_type(w, &*rtype, generics, true);
 		},
 		_ => {},
 	}
@@ -502,7 +501,7 @@ pub fn write_method_params<W: std::io::Write>(w: &mut W, sig: &syn::Signature, t
 /// mut ret = " assuming the next print will be the unmapped Rust function to call followed by the
 /// parameters we mapped to/from C here.
 pub fn write_method_var_decl_body<W: std::io::Write>(w: &mut W, sig: &syn::Signature, extra_indent: &str, types: &TypeResolver, generics: Option<&GenericTypes>, to_c: bool) {
-	let mut num_unused = 0;
+	let mut num_unused = 0u32;
 	for inp in sig.inputs.iter() {
 		match inp {
 			syn::FnArg::Receiver(_) => {},
@@ -531,7 +530,7 @@ pub fn write_method_var_decl_body<W: std::io::Write>(w: &mut W, sig: &syn::Signa
 					},
 					syn::Pat::Wild(w) => {
 						if !w.attrs.is_empty() { unimplemented!(); }
-						write_new_var!(syn::Ident::new(&format!("unused_{}", num_unused), Span::call_site()), *arg.ty);
+						write_new_var!(format_ident!("unused_{}", num_unused), *arg.ty);
 						num_unused += 1;
 					},
 					_ => unimplemented!(),
@@ -559,8 +558,9 @@ pub fn write_method_call_params<W: std::io::Write>(w: &mut W, sig: &syn::Signatu
 	for inp in sig.inputs.iter() {
 		match inp {
 			syn::FnArg::Receiver(recv) => {
-				if !recv.attrs.is_empty() || recv.reference.is_none() { unimplemented!(); }
+				if !recv.attrs.is_empty() { unimplemented!(); }
 				if to_c {
+					if recv.reference.is_none() { unimplemented!(); }
 					write!(w, "self.this_arg").unwrap();
 					first_arg = false;
 				}
@@ -624,7 +624,7 @@ pub fn write_method_call_params<W: std::io::Write>(w: &mut W, sig: &syn::Signatu
 				// 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();
 			} else if to_c {
-				let new_var = types.write_from_c_conversion_new_var(w, &syn::Ident::new("ret", Span::call_site()), rtype, generics);
+				let new_var = types.write_from_c_conversion_new_var(w, &format_ident!("ret"), rtype, generics);
 				if new_var {
 					write!(w, "\n\t{}", extra_indent).unwrap();
 				}
@@ -632,13 +632,12 @@ pub fn write_method_call_params<W: std::io::Write>(w: &mut W, sig: &syn::Signatu
 				write!(w, "ret").unwrap();
 				types.write_from_c_conversion_suffix(w, &*rtype, generics);
 			} else {
-				let ret_returned = if let syn::Type::Reference(_) = &**rtype { true } else { false };
-				let new_var = types.write_to_c_conversion_new_var(w, &syn::Ident::new("ret", Span::call_site()), &rtype, generics, true);
+				let new_var = types.write_to_c_conversion_new_var(w, &format_ident!("ret"), &rtype, generics, true);
 				if new_var {
 					write!(w, "\n\t{}", extra_indent).unwrap();
 				}
 				types.write_to_c_conversion_inline_prefix(w, &rtype, generics, true);
-				write!(w, "{}ret", if ret_returned && !new_var { "*" } else { "" }).unwrap();
+				write!(w, "ret").unwrap();
 				types.write_to_c_conversion_inline_suffix(w, &rtype, generics, true);
 			}
 		}
@@ -649,7 +648,7 @@ pub fn write_method_call_params<W: std::io::Write>(w: &mut W, sig: &syn::Signatu
 /// Prints concrete generic parameters for a struct/trait/function, including the less-than and
 /// greater-than symbols, if any generic parameters are defined.
 pub fn maybe_write_generics<W: std::io::Write>(w: &mut W, generics: &syn::Generics, types: &TypeResolver, concrete_lifetimes: bool) {
-	let mut gen_types = GenericTypes::new();
+	let mut gen_types = GenericTypes::new(None);
 	assert!(gen_types.learn_generics(generics, types));
 	if !generics.params.is_empty() {
 		write!(w, "<").unwrap();