From: Matt Corallo <git@bluematt.me>
Date: Wed, 3 Aug 2022 22:29:19 +0000 (+0000)
Subject: Try clone'ing the field before skipping exporting a field getter
X-Git-Tag: v0.0.110.1~1^2~1
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=9bcc4df3b321b69ebf0d0813bc16dac0771fc64f;p=ldk-c-bindings

Try clone'ing the field before skipping exporting a field getter
---

diff --git a/c-bindings-gen/src/main.rs b/c-bindings-gen/src/main.rs
index 42fd470..fd32a1c 100644
--- a/c-bindings-gen/src/main.rs
+++ b/c-bindings-gen/src/main.rs
@@ -735,6 +735,25 @@ fn writeln_struct<'a, 'b, W: std::io::Write>(w: &mut W, s: &'a syn::ItemStruct,
 						write!(w, "inner_val").unwrap();
 						types.write_to_c_conversion_inline_suffix(w, &ref_type, Some(&gen_types), true);
 						writeln!(w, "\n}}").unwrap();
+					} else {
+						// If the type isn't reference-able, but is clonable, export a getter that just clones
+						if types.understood_c_type(&$field.ty, Some(&gen_types)) {
+							let mut v = Vec::new();
+							types.write_c_type(&mut v, &$field.ty, Some(&gen_types), true);
+							let s = String::from_utf8(v).unwrap();
+							if types.is_clonable(&s) {
+								writeln_arg_docs(w, &$field.attrs, "", types, Some(&gen_types), vec![].drain(..), Some(&$field.ty));
+								writeln!(w, "///\n/// Returns a copy of the field.").unwrap();
+								write!(w, "#[no_mangle]\npub extern \"C\" fn {}_get_{}(this_ptr: &{}) -> {}", struct_name, $new_name, struct_name, s).unwrap();
+								write!(w, " {{\n\tlet mut inner_val = this_ptr.get_native_mut_ref().{}.clone();\n\t", $real_name).unwrap();
+								let local_var = types.write_to_c_conversion_new_var(w, &format_ident!("inner_val"), &$field.ty, Some(&gen_types), true);
+								if local_var { write!(w, "\n\t").unwrap(); }
+								types.write_to_c_conversion_inline_prefix(w, &$field.ty, Some(&gen_types), true);
+								write!(w, "inner_val").unwrap();
+								types.write_to_c_conversion_inline_suffix(w, &$field.ty, Some(&gen_types), true);
+								writeln!(w, "\n}}").unwrap();
+							}
+						}
 					}
 				}