style: modify match clauses created by migration

Author: DavSanchez

agent-control/src/sub_agent/on_host/supervisor.rs

@@ -368,16 +368,11 @@ fn wait_for_termination(
         drop(cvar.wait_while(lck.lock().unwrap(), |finish| !*finish));
 
         // context is unlocked here so locking it again in other thread that is blocking current_pid is safe.
-
-        match *current_pid.lock().unwrap() {
-            Some(pid) => {
-                info!(pid = pid, msg = "stopping supervisor process");
-                _ = ProcessTerminator::new(pid)
-                    .shutdown(|| wait_exit_timeout_default(shutdown_ctx));
-            }
-            _ => {
-                info!(msg = "stopped supervisor without process running");
-            }
+        if let Some(pid) = *current_pid.lock().unwrap() {
+            info!(%pid, msg = "stopping supervisor process");
+            _ = ProcessTerminator::new(pid).shutdown(|| wait_exit_timeout_default(shutdown_ctx));
+        } else {
+            info!(msg = "stopped supervisor without process running");
         }
     })
 }

agent-control/src/sub_agent/sub_agent.rs

@@ -204,15 +204,15 @@ where
                                         // TODO: we need to refactor the supervisor-assembler components in order to avoid persisting
                                         // and restarting the supervisor until the supervisor corresponding to the new configuration
                                         // is successfully.
-                                        match self.store_config_hash_and_values(&config, &yaml_config) { Err(err) => {
+                                        if let Err(err) = self.store_config_hash_and_values(&config, &yaml_config) {
                                             warn!(hash=&config.hash.get(), "Persisting remote configuration failed: {err}");
                                             self.report_config_status(&config, opamp_client, OpampRemoteConfigStatus::Error(err.to_string()));
-                                        } _ => {
+                                        } else {
                                             // We need to restart the supervisor after we receive a new config
                                             // as we don't have hot-reloading handling implemented yet
                                             stop_supervisor(supervisor);
                                             supervisor = self.assemble_and_start_supervisor();
-                                        }}
+                                        }
                                     }
                                 }
                             },

agent-control/src/utils/tests.rs

@@ -10,13 +10,10 @@ where
 {
     let mut last_err = Ok(());
     for _ in 0..max_attempts {
-        match f() {
-            Err(err) => last_err = Err(err),
-            _ => {
-                return;
-            }
-        }
-        std::thread::sleep(interval);
+        if let Err(err) = f() {
+            last_err = Err(err);
+            std::thread::sleep(interval);
+        };
     }
     last_err.unwrap_or_else(|err| panic!("retry failed after {max_attempts} attempts: {err}"))
 }

agent-control/tests/common/retry.rs

@@ -9,13 +9,10 @@ where
 {
     let mut last_err = Ok(());
     for _ in 0..max_attempts {
-        match f() {
-            Err(err) => last_err = Err(err),
-            _ => {
-                return;
-            }
+        if let Err(err) = f() {
+            last_err = Err(err);
+            std::thread::sleep(interval);
         }
-        std::thread::sleep(interval);
     }
     last_err.unwrap_or_else(|err| panic!("retry failed after {max_attempts} attempts: {err}"))
 }