From: Jeffrey Czyz <jkczyz@gmail.com>
Date: Thu, 19 May 2022 15:26:35 +0000 (-0500)
Subject: Support arrays inside Option types
X-Git-Tag: v0.0.108.0^2~28
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f9d5cd8f3aabce6fbdc6f6a5ee8d698d32c37e53;p=ldk-c-bindings

Support arrays inside Option types

Previously we'd supported arrays in options only if the real type
was something which we'd aliased to an array, so its not a big
stretch to support Options containing arrays explicitly.
---

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index 494a0ce..772c34b 100644
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -1503,7 +1503,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
 				if let Some(t) = single_contained {
 					match t {
-						syn::Type::Reference(_)|syn::Type::Path(_)|syn::Type::Slice(_) => {
+						syn::Type::Reference(_)|syn::Type::Path(_)|syn::Type::Slice(_)|syn::Type::Array(_) => {
 							let mut v = Vec::new();
 							let ret_ref = self.write_empty_rust_val_check_suffix(generics, &mut v, t);
 							let s = String::from_utf8(v).unwrap();
@@ -1799,7 +1799,6 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			syn::Type::Path(p) => {
 				let resolved = self.resolve_path(&p.path, generics);
 				if let Some(arr_ty) = self.is_real_type_array(&resolved) {
-					write!(w, ".data").unwrap();
 					return self.write_empty_rust_val_check_suffix(generics, w, &arr_ty);
 				}
 				if self.crate_types.opaques.get(&resolved).is_some() {
@@ -1819,7 +1818,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			syn::Type::Array(a) => {
 				if let syn::Expr::Lit(l) = &a.len {
 					if let syn::Lit::Int(i) = &l.lit {
-						write!(w, " == [0; {}]", i.base10_digits()).unwrap();
+						write!(w, ".data == [0; {}]", i.base10_digits()).unwrap();
 						EmptyValExpectedTy::NonPointer
 					} else { unimplemented!(); }
 				} else { unimplemented!(); }