Update with config constructor to still read config files first (#119)

Author: Kimahriman

rust/src/client.rs

@@ -158,7 +158,7 @@ impl Client {
 
     pub fn new_with_config(url: &str, config: HashMap<String, String>) -> Result<Self> {
         let parsed_url = Url::parse(url)?;
-        Self::with_config(&parsed_url, Configuration::from(config))
+        Self::with_config(&parsed_url, Configuration::new_with_config(config)?)
     }
 
     fn with_config(url: &Url, config: Configuration) -> Result<Self> {

rust/src/common/config.rs

@@ -21,12 +21,6 @@ pub struct Configuration {
     map: HashMap<String, String>,
 }
 
-impl From<HashMap<String, String>> for Configuration {
-    fn from(conf_map: HashMap<String, String>) -> Self {
-        Self { map: conf_map }
-    }
-}
-
 impl Configuration {
     pub fn new() -> io::Result<Self> {
         let mut map: HashMap<String, String> = HashMap::new();
@@ -47,6 +41,12 @@ impl Configuration {
         Ok(Configuration { map })
     }
 
+    pub fn new_with_config(conf_map: HashMap<String, String>) -> io::Result<Self> {
+        let mut conf = Self::new()?;
+        conf.map.extend(conf_map);
+        Ok(conf)
+    }
+
     /// Get a value from the config, returning None if the key wasn't defined.
     pub fn get(&self, key: &str) -> Option<String> {
         self.map.get(key).cloned()