X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Fmain.rs;h=f6e60cb5e67105e5e7c3e358911e6904ae463d10;hb=c434cf955420dcbc9788db83ec00be50ce5daa6a;hp=1bcc8f19731f435fb5e91a8e57625d4adff3f759;hpb=6728a81b78cec348a99084e841b055424425e27a;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/main.rs b/c-bindings-gen/src/main.rs
index 1bcc8f1..f6e60cb 100644
--- a/c-bindings-gen/src/main.rs
+++ b/c-bindings-gen/src/main.rs
@@ -84,9 +84,9 @@ fn maybe_convert_trait_impl<W: std::io::Write>(w: &mut W, trait_path: &syn::Path
 					writeln!(w, "}}").unwrap();
 				}
 			},
-			"lightning::util::ser::Readable"|"lightning::util::ser::ReadableArgs" => {
+			"lightning::util::ser::Readable"|"lightning::util::ser::ReadableArgs"|"lightning::util::ser::MaybeReadable" => {
 				// Create the Result<Object, DecodeError> syn::Type
-				let res_ty: syn::Type = parse_quote!(Result<#for_ty, ::ln::msgs::DecodeError>);
+				let mut res_ty: syn::Type = parse_quote!(Result<#for_ty, ::ln::msgs::DecodeError>);
 
 				writeln!(w, "#[no_mangle]").unwrap();
 				writeln!(w, "/// Read a {} from a byte array, created by {}_write", for_obj, for_obj).unwrap();
@@ -111,6 +111,8 @@ fn maybe_convert_trait_impl<W: std::io::Write>(w: &mut W, trait_path: &syn::Path
 							types.write_from_c_conversion_suffix(&mut arg_conv, &args_ty, Some(generics));
 						} else { unreachable!(); }
 					} else { unreachable!(); }
+				} else if t == "lightning::util::ser::MaybeReadable" {
+					res_ty = parse_quote!(Result<Option<#for_ty>, ::ln::msgs::DecodeError>);
 				}
 				write!(w, ") -> ").unwrap();
 				types.write_c_type(w, &res_ty, Some(generics), false);
@@ -118,12 +120,19 @@ fn maybe_convert_trait_impl<W: std::io::Write>(w: &mut W, trait_path: &syn::Path
 
 				if t == "lightning::util::ser::ReadableArgs" {
 					w.write(&arg_conv).unwrap();
-					write!(w, ";\n\tlet res: ").unwrap();
-					// At least in one case we need type annotations here, so provide them.
-					types.write_rust_type(w, Some(generics), &res_ty);
+					write!(w, ";\n").unwrap();
+				}
+
+				write!(w, "\tlet res: ").unwrap();
+				// At least in one case we need type annotations here, so provide them.
+				types.write_rust_type(w, Some(generics), &res_ty);
+
+				if t == "lightning::util::ser::ReadableArgs" {
 					writeln!(w, " = crate::c_types::deserialize_obj_arg(ser, arg_conv);").unwrap();
+				} else if t == "lightning::util::ser::MaybeReadable" {
+					writeln!(w, " = crate::c_types::maybe_deserialize_obj(ser);").unwrap();
 				} else {
-					writeln!(w, "\tlet res = crate::c_types::deserialize_obj(ser);").unwrap();
+					writeln!(w, " = crate::c_types::deserialize_obj(ser);").unwrap();
 				}
 				write!(w, "\t").unwrap();
 				if types.write_to_c_conversion_new_var(w, &format_ident!("res"), &res_ty, Some(generics), false) {
@@ -166,7 +175,7 @@ fn do_write_impl_trait<W: std::io::Write>(w: &mut W, trait_path: &str, _trait_na
 	match trait_path {
 		"lightning::util::ser::Writeable" => {
 			writeln!(w, "impl {} for {} {{", trait_path, for_obj).unwrap();
-			writeln!(w, "\tfn write<W: lightning::util::ser::Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {{").unwrap();
+			writeln!(w, "\tfn write<W: lightning::util::ser::Writer>(&self, w: &mut W) -> Result<(), crate::c_types::io::Error> {{").unwrap();
 			writeln!(w, "\t\tlet vec = (self.write)(self.this_arg);").unwrap();
 			writeln!(w, "\t\tw.write_all(vec.as_slice())").unwrap();
 			writeln!(w, "\t}}\n}}").unwrap();
@@ -482,13 +491,18 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 					&syn::TraitItem::Type(ref t) => {
 						if t.default.is_some() || t.generics.lt_token.is_some() { unimplemented!(); }
 						let mut bounds_iter = t.bounds.iter();
-						match bounds_iter.next().unwrap() {
-							syn::TypeParamBound::Trait(tr) => {
-								writeln!(w, "\ttype {} = crate::{};", t.ident, $type_resolver.resolve_path(&tr.path, Some(&gen_types))).unwrap();
-							},
-							_ => unimplemented!(),
+						loop {
+							match bounds_iter.next().unwrap() {
+								syn::TypeParamBound::Trait(tr) => {
+									writeln!(w, "\ttype {} = crate::{};", t.ident, $type_resolver.resolve_path(&tr.path, Some(&gen_types))).unwrap();
+									for bound in bounds_iter {
+										if let syn::TypeParamBound::Trait(_) = bound { unimplemented!(); }
+									}
+									break;
+								},
+								syn::TypeParamBound::Lifetime(_) => {},
+							}
 						}
-						if bounds_iter.next().is_some() { unimplemented!(); }
 					},
 					_ => unimplemented!(),
 				}
@@ -670,7 +684,7 @@ fn writeln_struct<'a, 'b, W: std::io::Write>(w: &mut W, s: &'a syn::ItemStruct,
 						write!(w, "#[no_mangle]\npub extern \"C\" fn {}_get_{}(this_ptr: &{}) -> ", struct_name, $new_name, struct_name).unwrap();
 						types.write_c_type(w, &ref_type, Some(&gen_types), true);
 						write!(w, " {{\n\tlet mut inner_val = &mut this_ptr.get_native_mut_ref().{};\n\t", $real_name).unwrap();
-						let local_var = types.write_to_c_conversion_new_var(w, &format_ident!("inner_val"), &ref_type, Some(&gen_types), true);
+						let local_var = types.write_to_c_conversion_from_ownable_ref_new_var(w, &format_ident!("inner_val"), &ref_type, Some(&gen_types));
 						if local_var { write!(w, "\n\t").unwrap(); }
 						types.write_to_c_conversion_inline_prefix(w, &ref_type, Some(&gen_types), true);
 						write!(w, "inner_val").unwrap();