X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-c-bindings;a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Ftypes.rs;h=0a6bce453e5628a4847c890e44c9ca0c49e5ac16;hp=5fc90b1ff29fbcd478a50cf1389e174954540ab0;hb=dd5bf474af6c806b20c26f4f2b751f3226a94dfd;hpb=690a087df3712fc4aa64521e6a9beb4a29f876eb

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index 5fc90b1..0a6bce4 100644
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -1386,6 +1386,14 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 					}
 				}
 				if let Some(t) = single_contained {
+					if let syn::Type::Tuple(syn::TypeTuple { elems, .. }) = t {
+						assert!(elems.is_empty());
+						let inner_name = self.get_c_mangled_container_type(vec![single_contained.unwrap()], generics, "Option").unwrap();
+						return Some(("if ", vec![
+							(format!(".is_none() {{ {}::None }} else {{ {}::Some /*",
+								inner_name, inner_name), format!(""))
+							], " */}", ContainerPrefixLocation::PerConv));
+					}
 					if let syn::Type::Reference(syn::TypeReference { elem, .. }) = t {
 						if let syn::Type::Slice(_) = &**elem {
 							return Some(("if ", vec![
@@ -2393,7 +2401,13 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 				}
 				if !self.write_c_type_intern(w, t, generics, false, false, false, false) { return false; }
 			} else {
-				assert!(!is_ref); // We don't currently support outer reference types for non-primitive inners
+				// We don't currently support outer reference types for non-primitive inners,
+				// except for the empty tuple.
+				if let syn::Type::Tuple(t_arg) = t {
+					assert!(t_arg.elems.len() == 0 || !is_ref);
+				} else {
+					assert!(!is_ref);
+				}
 				if !self.write_c_type_intern(w, t, generics, false, false, false, false) { return false; }
 			}
 		}