update confy

omallassi · Apr 18, 2024 · 6773323 · 6773323
1 parent f05bc73
commit 6773323
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/adr_config_local_impl/Cargo.toml b/adr_config_local_impl/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 # confy = "0.3.1"
 # use git master dep to get the truncate (https://github.com/rust-cli/confy/blob/master/src/lib.rs#L195)
-confy = "0.5.1"  #{ git = "https://github.com/rust-cli/confy", rev = "5a58388fa9b8bcd790a62c2a9db5abdcbe9fb467"} 
+confy = "0.6.1"  #{ git = "https://github.com/rust-cli/confy", rev = "5a58388fa9b8bcd790a62c2a9db5abdcbe9fb467"} 
 serde_json = "1.0.107"
 serde_yaml = "0.9.25"
 serde = "1.0.198"

diff --git a/adr_config_local_impl/src/config/mod.rs b/adr_config_local_impl/src/config/mod.rs
@@ -123,10 +123,7 @@ pub fn set_config_from_name(config: &str, name: &str, value: &str) -> Result<()>
         //for now keep it to apply standard murex convention
         let cfg: AdrToolConfig = get_config_from_name(config);
         let adr_src_dir = String::from(value);
-        //adr_src_dir.push_str("/src");
-
         let adr_template_dir = Path::new(value).join("templates");
-
         let adr_search_index = Path::new(value).join(".index");
 
         let new_cfg = AdrToolConfig {
@@ -151,9 +148,8 @@ pub fn set_config_from_name(config: &str, name: &str, value: &str) -> Result<()>
                     get_logger(),
                     "Error while updating config file for property [{}] - [{}]", &name, &why
                 );
-                AdrToolConfig::default()
             }
-            Ok(_e) => cfg,
+            Ok(_e) => {}
         };
     }
     if ADR_TEMPLATE_DIR == name {
@@ -165,9 +161,8 @@ pub fn set_config_from_name(config: &str, name: &str, value: &str) -> Result<()>
                     get_logger(),
                     "Error while updating config file for property [{}] - [{}]", &name, &why
                 );
-                AdrToolConfig::default()
             }
-            Ok(_e) => cfg,
+            Ok(_e) => {}
         };
     }
     if ADR_TEMPLATE_FILE == name {
@@ -179,9 +174,8 @@ pub fn set_config_from_name(config: &str, name: &str, value: &str) -> Result<()>
                     get_logger(),
                     "Error while updating config file for property [{}] - [{}]", &name, &why
                 );
-                AdrToolConfig::default()
             }
-            Ok(_e) => cfg,
+            Ok(_e) => {}
         };
     }
     if LOG_LEVEL == name {
@@ -193,9 +187,8 @@ pub fn set_config_from_name(config: &str, name: &str, value: &str) -> Result<()>
                     get_logger(),
                     "Error while updating config file for property [{}] - [{}]", &name, &why
                 );
-                AdrToolConfig::default()
             }
-            Ok(_e) => cfg,
+            Ok(_e) => {}
         };
     }
 
@@ -208,9 +201,8 @@ pub fn set_config_from_name(config: &str, name: &str, value: &str) -> Result<()>
                     get_logger(),
                     "Error while updating config file for property [{}] - [{}]", &name, &why
                 );
-                AdrToolConfig::default()
             }
-            Ok(_e) => cfg,
+            Ok(_e) => {}
         };
     }
 
@@ -223,9 +215,8 @@ pub fn set_config_from_name(config: &str, name: &str, value: &str) -> Result<()>
                     get_logger(),
                     "Error while updating config file for property [{}] - [{}]", &name, &why
                 );
-                AdrToolConfig::default()
             }
-            Ok(_e) => cfg,
+            Ok(_e) => {}
         };
     }