]> git.lizzy.rs Git - rust.git/commitdiff
Warn when there are unknown config options
authortopecongiro <seuchida@gmail.com>
Mon, 11 Dec 2017 15:54:55 +0000 (00:54 +0900)
committertopecongiro <seuchida@gmail.com>
Mon, 11 Dec 2017 15:54:55 +0000 (00:54 +0900)
src/config.rs

index ed44df022a944b0c119355db1c614b189ff73822..ff90a96b91ef1eff1e0098cc4dc88255c79864c4 100644 (file)
@@ -394,22 +394,23 @@ pub fn from_toml(toml: &str) -> Result<Config, String> {
                             $(
                                 stringify!($i) => (),
                             )+
-                                _ => {
-                                    let msg =
-                                        &format!("Warning: Unknown configuration option `{}`\n",
-                                                 key);
-                                    err.push_str(msg)
-                                }
+                            _ => {
+                                let msg =
+                                    &format!("Warning: Unknown configuration option `{}`\n", key);
+                                err.push_str(msg)
+                            }
                         }
                     }
                 }
                 match parsed.try_into() {
-                    Ok(parsed_config) =>
-                        Ok(Config::default().fill_from_parsed_config(parsed_config)),
+                    Ok(parsed_config) => {
+                        eprintln!("{}", err);
+                        Ok(Config::default().fill_from_parsed_config(parsed_config))
+                    }
                     Err(e) => {
                         err.push_str("Error: Decoding config file failed:\n");
                         err.push_str(format!("{}\n", e).as_str());
-                        err.push_str("Please check your config file.\n");
+                        err.push_str("Please check your config file.");
                         Err(err)
                     }
                 }