Expand macro to add compile-time type check

jkczyz · shaavan · commit 8da348e3768a · 2025-02-25T18:40:46.000+05:30
diff --git a/lightning/src/util/ser_macros.rs b/lightning/src/util/ser_macros.rs
@@ -40,7 +40,7 @@ macro_rules! _encode_tlv {
 		}
 	};
 	($stream: expr, $optional_type: expr, $optional_field: expr, (legacy, $fieldty: ty, $write: expr) $(, $self: ident)?) => {
-		$crate::_encode_tlv!($stream, $optional_type, $write($($self)?), option);
+		$crate::_encode_tlv!($stream, $optional_type, { let value: Option<$fieldty> = $write($($self)?); value }, option);
 	};
 	($stream: expr, $type: expr, $field: expr, optional_vec $(, $self: ident)?) => {
 		if !$field.is_empty() {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ macro_rules! _encode_tlv {`
`40`	`40`	`}`
`41`	`41`	`};`
`42`	`42`	`($stream: expr, $optional_type: expr, $optional_field: expr, (legacy, $fieldty: ty, $write: expr) $(, $self: ident)?) => {`
`43`		`- $crate::_encode_tlv!($stream, $optional_type, $write($($self)?), option);`
	`43`	`+ $crate::_encode_tlv!($stream, $optional_type, { let value: Option<$fieldty> = $write($($self)?); value }, option);`
`44`	`44`	`};`
`45`	`45`	`($stream: expr, $type: expr, $field: expr, optional_vec $(, $self: ident)?) => {`
`46`	`46`	`if !$field.is_empty() {`