[rust] don't clone the config struct (#11856)

* don't clone the config struct

* fix types

---------

Co-authored-by: ogonzalez <[email protected]>
Co-authored-by: Diego Molina <[email protected]>

Author: 3 people

rust/src/chrome.rs

@@ -280,6 +280,10 @@ impl SeleniumManager for ChromeManager {
         &self.config
     }
 
+    fn get_config_mut(&mut self) -> &mut ManagerConfig {
+        &mut self.config
+    }
+
     fn set_config(&mut self, config: ManagerConfig) {
         self.config = config;
     }

rust/src/edge.rs

@@ -264,6 +264,10 @@ impl SeleniumManager for EdgeManager {
         &self.config
     }
 
+    fn get_config_mut(&mut self) -> &mut ManagerConfig {
+        &mut self.config
+    }
+
     fn set_config(&mut self, config: ManagerConfig) {
         self.config = config;
     }

rust/src/firefox.rs

@@ -263,6 +263,10 @@ impl SeleniumManager for FirefoxManager {
         &self.config
     }
 
+    fn get_config_mut(&mut self) -> &mut ManagerConfig {
+        &mut self.config
+    }
+
     fn set_config(&mut self, config: ManagerConfig) {
         self.config = config;
     }

rust/src/iexplorer.rs

@@ -196,6 +196,10 @@ impl SeleniumManager for IExplorerManager {
         &self.config
     }
 
+    fn get_config_mut(&mut self) -> &mut ManagerConfig {
+        &mut self.config
+    }
+
     fn set_config(&mut self, config: ManagerConfig) {
         self.config = config;
     }

rust/src/lib.rs

@@ -111,6 +111,8 @@ pub trait SeleniumManager {
 
     fn get_config(&self) -> &ManagerConfig;
 
+    fn get_config_mut(&mut self) -> &mut ManagerConfig;
+
     fn set_config(&mut self, config: ManagerConfig);
 
     fn get_logger(&self) -> &Logger;
@@ -362,19 +364,17 @@ pub trait SeleniumManager {
     }
 
     fn set_os(&mut self, os: String) {
-        let mut config = ManagerConfig::clone(self.get_config());
+        let mut config = self.get_config_mut();
         config.os = os;
-        self.set_config(config);
     }
 
     fn get_arch(&self) -> &str {
         self.get_config().arch.as_str()
     }
 
     fn set_arch(&mut self, arch: String) {
-        let mut config = ManagerConfig::clone(self.get_config());
+        let mut config = self.get_config_mut();
         config.arch = arch;
-        self.set_config(config);
     }
 
     fn get_browser_version(&self) -> &str {
@@ -383,9 +383,8 @@ pub trait SeleniumManager {
 
     fn set_browser_version(&mut self, browser_version: String) {
         if !browser_version.is_empty() {
-            let mut config = ManagerConfig::clone(self.get_config());
+            let mut config = self.get_config_mut();
             config.browser_version = browser_version;
-            self.set_config(config);
         }
     }
 
@@ -395,9 +394,8 @@ pub trait SeleniumManager {
 
     fn set_driver_version(&mut self, driver_version: String) {
         if !driver_version.is_empty() {
-            let mut config = ManagerConfig::clone(self.get_config());
+            let mut config = self.get_config_mut();
             config.driver_version = driver_version;
-            self.set_config(config);
         }
     }
 
@@ -407,22 +405,20 @@ pub trait SeleniumManager {
 
     fn set_browser_path(&mut self, browser_path: String) {
         if !browser_path.is_empty() {
-            let mut config = ManagerConfig::clone(self.get_config());
+            let mut config = self.get_config_mut();
             config.browser_path = browser_path;
-            self.set_config(config);
         }
     }
 
     fn get_proxy(&self) -> &str {
         self.get_config().proxy.as_str()
     }
 
-    fn set_proxy(&mut self, proxy: String) -> Result<(), String> {
+    fn set_proxy(&mut self, proxy: String) -> Result<(), Box<dyn Error>> {
         if !proxy.is_empty() {
-            let mut config = ManagerConfig::clone(self.get_config());
-            config.proxy = proxy.to_string();
-            self.set_config(config);
             self.get_logger().debug(format!("Using proxy: {}", &proxy));
+            let mut config = self.get_config_mut();
+            config.proxy = proxy;
             self.update_http_client()?;
         }
         Ok(())
@@ -432,12 +428,11 @@ pub trait SeleniumManager {
         self.get_config().timeout
     }
 
-    fn set_timeout(&mut self, timeout: u64) -> Result<(), String> {
-        let default_timeout = self.get_config().timeout.to_owned();
+    fn set_timeout(&mut self, timeout: u64) -> Result<(), Box<dyn Error>> {
+        let mut config = self.get_config_mut();
+        let default_timeout = config.timeout;
         if timeout != default_timeout {
-            let mut config = ManagerConfig::clone(self.get_config());
             config.timeout = timeout;
-            self.set_config(config);
             self.get_logger()
                 .debug(format!("Using timeout of {} seconds", timeout));
             self.update_http_client()?;

rust/src/main.rs

@@ -140,15 +140,15 @@ fn main() {
     selenium_manager
         .set_timeout(cli.timeout)
         .and_then(|_| selenium_manager.set_proxy(cli.proxy.unwrap_or_default()))
-        .and_then(|_| selenium_manager.resolve_driver().map_err(|x| x.to_string()))
+        .and_then(|_| selenium_manager.resolve_driver())
         .and_then(|path| {
             let log = selenium_manager.get_logger();
             log.info(path.display().to_string());
             flush_and_exit(OK, &log);
         })
         .unwrap_or_else(|err| {
             let log = selenium_manager.get_logger();
-            log.error(err);
+            log.error(err.to_string());
             flush_and_exit(DATAERR, &log);
         });
 }

rust/src/safari.rs

@@ -113,6 +113,10 @@ impl SeleniumManager for SafariManager {
         &self.config
     }
 
+    fn get_config_mut(&mut self) -> &mut ManagerConfig {
+        &mut self.config
+    }
+
     fn set_config(&mut self, config: ManagerConfig) {
         self.config = config;
     }

rust/src/safaritp.rs

@@ -118,6 +118,10 @@ impl SeleniumManager for SafariTPManager {
         &self.config
     }
 
+    fn get_config_mut(&mut self) -> &mut ManagerConfig {
+        &mut self.config
+    }
+
     fn set_config(&mut self, config: ManagerConfig) {
         self.config = config;
     }