X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fser_macros.rs;h=92a43b3fde5282fb4420d4981c1e23b3d9bd0e81;hb=328407351c6aeb84e9407281ec5d35b1a4690650;hp=59402f6acc8e0eab43810eb896a678186e2e9efc;hpb=6aa5ebb1aac21f65462bbd747627ae58e2949ae3;p=rust-lightning

diff --git a/lightning/src/util/ser_macros.rs b/lightning/src/util/ser_macros.rs
index 59402f6a..92a43b3f 100644
--- a/lightning/src/util/ser_macros.rs
+++ b/lightning/src/util/ser_macros.rs
@@ -874,6 +874,8 @@ macro_rules! tlv_record_ref_type {
 	($type:ty) => { &'a $type };
 }
 
+#[doc(hidden)]
+#[macro_export]
 macro_rules! _impl_writeable_tlv_based_enum_common {
 	($st: ident, $(($variant_id: expr, $variant_name: ident) =>
 		{$(($type: expr, $field: ident, $fieldty: tt)),* $(,)*}
@@ -885,7 +887,7 @@ macro_rules! _impl_writeable_tlv_based_enum_common {
 					$($st::$variant_name { $(ref $field),* } => {
 						let id: u8 = $variant_id;
 						id.write(writer)?;
-						write_tlv_fields!(writer, {
+						$crate::write_tlv_fields!(writer, {
 							$(($type, *$field, $fieldty)),*
 						});
 					}),*
@@ -923,7 +925,7 @@ macro_rules! impl_writeable_tlv_based_enum {
 		{$(($type: expr, $field: ident, $fieldty: tt)),* $(,)*}
 	),* $(,)*;
 	$(($tuple_variant_id: expr, $tuple_variant_name: ident)),*  $(,)*) => {
-		_impl_writeable_tlv_based_enum_common!($st,
+		$crate::_impl_writeable_tlv_based_enum_common!($st,
 			$(($variant_id, $variant_name) => {$(($type, $field, $fieldty)),*}),*;
 			$(($tuple_variant_id, $tuple_variant_name)),*);
 
@@ -935,12 +937,12 @@ macro_rules! impl_writeable_tlv_based_enum {
 						// Because read_tlv_fields creates a labeled loop, we cannot call it twice
 						// in the same function body. Instead, we define a closure and call it.
 						let f = || {
-							_init_and_read_tlv_fields!(reader, {
+							$crate::_init_and_read_tlv_fields!(reader, {
 								$(($type, $field, $fieldty)),*
 							});
 							Ok($st::$variant_name {
 								$(
-									$field: _init_tlv_based_struct_field!($field, $fieldty)
+									$field: $crate::_init_tlv_based_struct_field!($field, $fieldty)
 								),*
 							})
 						};
@@ -977,7 +979,7 @@ macro_rules! impl_writeable_tlv_based_enum_upgradable {
 	),* $(,)*
 	$(;
 	$(($tuple_variant_id: expr, $tuple_variant_name: ident)),*  $(,)*)*) => {
-		_impl_writeable_tlv_based_enum_common!($st,
+		$crate::_impl_writeable_tlv_based_enum_common!($st,
 			$(($variant_id, $variant_name) => {$(($type, $field, $fieldty)),*}),*;
 			$($(($tuple_variant_id, $tuple_variant_name)),*)*);
 
@@ -989,12 +991,12 @@ macro_rules! impl_writeable_tlv_based_enum_upgradable {
 						// Because read_tlv_fields creates a labeled loop, we cannot call it twice
 						// in the same function body. Instead, we define a closure and call it.
 						let f = || {
-							_init_and_read_tlv_fields!(reader, {
+							$crate::_init_and_read_tlv_fields!(reader, {
 								$(($type, $field, $fieldty)),*
 							});
 							Ok(Some($st::$variant_name {
 								$(
-									$field: _init_tlv_based_struct_field!($field, $fieldty)
+									$field: $crate::_init_tlv_based_struct_field!($field, $fieldty)
 								),*
 							}))
 						};