Move NodeState from parameter options to enabled default derivation

Author: BCSol

rclrs/src/parameter/structured.rs

@@ -1,34 +1,37 @@
-use crate::NodeState;
+use crate::{Node, NodeState};
 
 pub enum DefaultForbidden {}
 
-pub struct ParameterOptions<'a, 'b, T> {
-    node: &'a crate::NodeState,
-    name: &'b str,
+pub struct ParameterOptions<'a, T> {
+    name: &'a str,
     default: Option<T>,
 }
+
 pub trait StructuredParametersMeta<T>: Sized {
     fn declare_structured_(
+        node: &NodeState,
         options: ParameterOptions<T>,
     ) -> core::result::Result<Self, crate::DeclarationError>;
 }
 
 pub trait StructuredParameters: Sized {
     fn declare_structured<T>(
+        node: &NodeState,
         options: ParameterOptions<T>,
     ) -> core::result::Result<Self, crate::DeclarationError>
     where
         Self: StructuredParametersMeta<T>,
     {
-        Self::declare_structured_(options)
+        Self::declare_structured_(node, options)
     }
 }
 impl<T: crate::ParameterVariant> StructuredParameters for crate::MandatoryParameter<T> {}
 impl<T: crate::ParameterVariant> StructuredParametersMeta<T> for crate::MandatoryParameter<T> {
     fn declare_structured_(
+        node: &NodeState,
         options: ParameterOptions<T>,
     ) -> core::result::Result<Self, crate::DeclarationError> {
-        let builder = options.node.declare_parameter(options.name);
+        let builder = node.declare_parameter(options.name);
         let builder = match options.default {
             Some(default) => builder.default(default),
             None => builder,
@@ -39,9 +42,10 @@ impl<T: crate::ParameterVariant> StructuredParametersMeta<T> for crate::Mandator
 impl<T: crate::ParameterVariant> StructuredParameters for crate::ReadOnlyParameter<T> {}
 impl<T: crate::ParameterVariant> StructuredParametersMeta<T> for crate::ReadOnlyParameter<T> {
     fn declare_structured_(
+        node: &NodeState,
         options: ParameterOptions<T>,
     ) -> core::result::Result<Self, crate::DeclarationError> {
-        let builder = options.node.declare_parameter(options.name);
+        let builder = node.declare_parameter(options.name);
         let builder = match options.default {
             Some(default) => builder.default(default),
             None => builder,
@@ -52,9 +56,10 @@ impl<T: crate::ParameterVariant> StructuredParametersMeta<T> for crate::ReadOnly
 impl<T: crate::ParameterVariant> StructuredParameters for crate::OptionalParameter<T> {}
 impl<T: crate::ParameterVariant> StructuredParametersMeta<T> for crate::OptionalParameter<T> {
     fn declare_structured_(
+        node: &NodeState,
         options: ParameterOptions<T>,
     ) -> core::result::Result<Self, crate::DeclarationError> {
-        let builder = options.node.declare_parameter(options.name);
+        let builder = node.declare_parameter(options.name);
         let builder = match options.default {
             Some(default) => builder.default(default),
             None => builder,
@@ -71,11 +76,13 @@ impl NodeState {
     where
         T: StructuredParameters + StructuredParametersMeta<T0>,
     {
-        T::declare_structured(ParameterOptions {
-            node: self,
-            name: name,
-            default: None,
-        })
+        T::declare_structured(
+            self,
+            ParameterOptions {
+                name: name,
+                default: None,
+            },
+        )
     }
 }
 

rclrs_proc_macros/src/impl.rs

@@ -61,8 +61,8 @@ pub(crate) fn derive_struct_parameters(input: DeriveInput) -> syn::Result<TokenS
         };
         let r = quote! {
            #ident : #field_type::declare_structured(
+              node,
               rclrs::parameter::structured::ParameterOptions {
-                node: options.node,
                 name: &{match options.name {
                     "" => #ident_str.to_string(),
                     prefix => [prefix, ".", #ident_str].concat(),
@@ -84,7 +84,7 @@ pub(crate) fn derive_struct_parameters(input: DeriveInput) -> syn::Result<TokenS
             };
       }
       impl rclrs::parameter::structured::StructuredParametersMeta<rclrs::parameter::structured::DefaultForbidden> for #ident {
-        fn declare_structured_(options: rclrs::parameter::structured::ParameterOptions<rclrs::parameter::structured::DefaultForbidden>)
+        fn declare_structured_(node: &rclrs::NodeState, options: rclrs::parameter::structured::ParameterOptions<rclrs::parameter::structured::DefaultForbidden>)
           -> core::result::Result<Self, crate::DeclarationError> {
               core::result::Result::Ok(Self{ #(#args)*})
           }