Reformat code and release as 0.93.1

Signed-off-by: Daniel Egger <[email protected]>
axiros · Sep 24, 2024 · 8991248 · 8991248
1 parent 4568413
commit 8991248
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 47 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ license = "BSD-3-Clause"
 name = "rusp"
 readme = "README.md"
 repository = "https://github.com/axiros/rusp"
-version = "0.93.0"
+version = "0.93.1"
 
 [badges]
 [badges.travis-ci]

diff --git a/src/usp_builder/add.rs b/src/usp_builder/add.rs
@@ -182,10 +182,7 @@ impl AddOperationStatus {
                             },
                         })
                         .collect(),
-                    unique_keys: s
-                        .unique_keys
-                        .into_iter()
-                        .collect(),
+                    unique_keys: s.unique_keys.into_iter().collect(),
                 }),
             }),
             Self::None => Err(anyhow::anyhow!("")),

diff --git a/src/usp_builder/delete.rs b/src/usp_builder/delete.rs
@@ -135,10 +135,7 @@ impl DeletedObjectResultsBuilder {
                     }),
                 }),
                 DeleteRespOperationStatus::Failure { err_code, err_msg } => Some(OperationStatus {
-                    oper_status: oper_failure(OperationFailure {
-                        err_code,
-                        err_msg,
-                    }),
+                    oper_status: oper_failure(OperationFailure { err_code, err_msg }),
                 }),
                 DeleteRespOperationStatus::None => Err(anyhow::anyhow!(""))?,
             },

diff --git a/src/usp_builder/get.rs b/src/usp_builder/get.rs
@@ -73,10 +73,7 @@ impl ResolvedPathResultBuilder {
     }
 
     pub fn build(self) -> Result<ResolvedPathResult> {
-        let result_params = self
-            .result_params
-            .into_iter()
-            .collect();
+        let result_params = self.result_params.into_iter().collect();
 
         Ok(ResolvedPathResult {
             resolved_path: self.resolved_path,

diff --git a/src/usp_builder/getinstances.rs b/src/usp_builder/getinstances.rs
@@ -73,10 +73,7 @@ impl CurrInstanceBuilder {
     }
 
     pub fn build(self) -> Result<CurrInstance> {
-        let unique_keys = self
-            .unique_keys
-            .into_iter()
-            .collect();
+        let unique_keys = self.unique_keys.into_iter().collect();
 
         Ok(CurrInstance {
             instantiated_obj_path: self.instantiated_obj_path,

diff --git a/src/usp_builder/msg.rs b/src/usp_builder/msg.rs
@@ -93,10 +93,7 @@ impl MsgBuilder {
         };
 
         Ok(Msg {
-            header: Some(Header {
-                msg_id,
-                msg_type,
-            }),
+            header: Some(Header { msg_id, msg_type }),
             body: Some(body),
         })
     }

diff --git a/src/usp_builder/notify.rs b/src/usp_builder/notify.rs
@@ -228,22 +228,16 @@ impl NotifyBuilder {
             } => event(Event {
                 obj_path,
                 event_name,
-                params: params
-                    .into_iter()
-                    .collect::<HashMap<_, _>>(),
+                params: params.into_iter().collect::<HashMap<_, _>>(),
             }),
             NotifyType::ObjectCreation {
                 obj_path,
                 unique_keys,
             } => obj_creation(ObjectCreation {
                 obj_path,
-                unique_keys: unique_keys
-                    .into_iter()
-                    .collect::<HashMap<_, _>>(),
-            }),
-            NotifyType::ObjectDeletion { obj_path } => obj_deletion(ObjectDeletion {
-                obj_path,
+                unique_keys: unique_keys.into_iter().collect::<HashMap<_, _>>(),
             }),
+            NotifyType::ObjectDeletion { obj_path } => obj_deletion(ObjectDeletion { obj_path }),
             NotifyType::OperationComplete {
                 obj_path,
                 command_name,
@@ -256,9 +250,7 @@ impl NotifyBuilder {
                 operation_resp: match operation_resp {
                     OperationCompleteType::OutputArgs(h) => OneOfoperation_resp::req_output_args(
                         crate::usp::mod_Notify::mod_OperationComplete::OutputArgs {
-                            output_args: h
-                                .into_iter()
-                                .collect::<HashMap<_, _>>(),
+                            output_args: h.into_iter().collect::<HashMap<_, _>>(),
                         },
                     ),
                     OperationCompleteType::CommandFailure(code, msg) => {

diff --git a/src/usp_builder/operate.rs b/src/usp_builder/operate.rs
@@ -59,10 +59,7 @@ impl OperateBuilder {
                             command: self.command,
                             command_key: self.command_key,
                             send_resp: self.send_resp,
-                            input_args: self
-                                .input_args
-                                .into_iter()
-                                .collect(),
+                            input_args: self.input_args.into_iter().collect(),
                         }
                     }),
                 }
@@ -128,9 +125,7 @@ impl OperateRespResultBuilder {
         match self.operation_result {
             OperateRespOperationResult::OutputArgs { output_args } => Ok(OperationResult {
                 operation_resp: OneOfoperation_resp::req_output_args(OutputArgs {
-                    output_args: output_args
-                        .into_iter()
-                        .collect::<HashMap<_, _>>(),
+                    output_args: output_args.into_iter().collect::<HashMap<_, _>>(),
                 }),
                 executed_command: self.executed_command,
             }),

diff --git a/src/usp_builder/record.rs b/src/usp_builder/record.rs
@@ -104,9 +104,7 @@ impl SessionContextBuilder {
             payload_sar_state: PayloadSARState::NONE,
             // FIXME
             payloadrec_sar_state: PayloadSARState::NONE,
-            payload: self
-                .payload
-                .map_or_else(Vec::new, |payload| vec![payload]),
+            payload: self.payload.map_or_else(Vec::new, |payload| vec![payload]),
         };
 
         Ok(scr)

diff --git a/src/usp_builder/set.rs b/src/usp_builder/set.rs
@@ -260,10 +260,7 @@ impl SetOperationStatus {
                                     },
                                 })
                                 .collect(),
-                            updated_params: s
-                                .updated_params
-                                .into_iter()
-                                .collect(),
+                            updated_params: s.updated_params.into_iter().collect(),
                         })
                         .collect(),
                 }),