Take params by reference

RReverser · Sep 25, 2024 · 68b94de · 68b94de
1 parent c2d0a66
commit 68b94de
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/macros.rs b/src/macros.rs
@@ -54,8 +54,8 @@ macro_rules! rpc_trait {
 
         impl $crate::params::Action for [<$trait_name Action>] {
             #[cfg(feature = "server")]
-            fn from_parts(action: &str, params: $crate::server::ActionParams) -> $crate::server::Result<Result<Self, $crate::server::ActionParams>> {
-                Ok(Ok(match (action, params) {
+            fn from_parts(action: &str, params: &mut $crate::server::ActionParams) -> $crate::server::Result<Option<Self>> {
+                Ok(Some(match (action, params) {
                     $(
                         ($method_path, $crate::server::ActionParams::$http_method(params)) => {
                             #[allow(unused)]
@@ -71,7 +71,7 @@ macro_rules! rpc_trait {
                             Self::$method_name { $($param),* }
                         }
                     )*
-                    (_, params) => return Ok(Err(params)),
+                    _ => return Ok(None),
                 }))
             }
 
@@ -135,24 +135,24 @@ macro_rules! rpc_trait {
             /// Private inherent method for handling actions.
             /// This method could live on the trait itself, but then it wouldn't be possible to make it private.
             #[allow(non_camel_case_types)]
-            async fn handle_action(device: &(impl ?Sized + $trait_name), action: &str, params: $crate::server::ActionParams) -> $crate::server::Result<impl Serialize> {
+            async fn handle_action(device: &(impl ?Sized + $trait_name), action: &str, mut params: $crate::server::ActionParams) -> $crate::server::Result<impl Serialize> {
                 #[derive(Serialize)]
                 #[serde(untagged)]
                 #[allow(non_camel_case_types)]
                 enum ResponseRepr<$($method_name),*> {
                     $($method_name($method_name),)*
                 }
 
-                let value = match $crate::params::Action::from_parts(action, params)? {
-                    Ok(action) => match action {
+                let value = match $crate::params::Action::from_parts(action, &mut params)? {
+                    Some(action) => match action {
                         $(
                             [<$trait_name Action>]::$method_name { $($param),* } => {
                                 #[allow(deprecated)]
                                 device.$method_name($($param),*).await.map(ResponseRepr::$method_name)
                             }
                         )*
                     }?,
-                    Err(params) => rpc_trait!(@if_specific $trait_name {
+                    None=> rpc_trait!(@if_specific $trait_name {
                         return match <dyn Device>::handle_action(device, action, params).await {
                             Ok(value) => Ok($crate::either::Either::Right(value)),
                             Err(mut err) => {

diff --git a/src/params.rs b/src/params.rs
@@ -23,8 +23,8 @@ pub(crate) trait Action: Sized + Send {
     #[cfg(feature = "server")]
     fn from_parts(
         action: &str,
-        params: crate::server::ActionParams,
-    ) -> crate::server::Result<Result<Self, crate::server::ActionParams>>;
+        params: &mut crate::server::ActionParams,
+    ) -> crate::server::Result<Option<Self>>;
 
     #[cfg(feature = "client")]
     fn into_parts(self) -> ActionParams<impl serde::Serialize + Send>;

diff --git a/src/server/params.rs b/src/server/params.rs
@@ -61,7 +61,7 @@ where
             .ok_or(Error::MissingParameter { name })
     }
 
-    pub(crate) fn finish_extraction(self) {
+    pub(crate) fn finish_extraction(&self) {
         if !self.0.is_empty() {
             tracing::warn!("Unused parameters: {:?}", self.0.keys());
         }