Add explicit lifetime

[rust.git] / src / config.rs

diff --git a/src/config.rs b/src/config.rs
index 9659f19377d06227983f8df20608769551656321..30d79cdc562983b00017c01c574c3b4e346d0e4c 100644 (file)
--- a/src/config.rs
+++ b/src/config.rs
@@ -306,7 +306,7 @@ pub fn from_toml(toml: &str) -> Result<Config, String> {
                     let table = parsed
                         .as_table()
                         .ok_or(String::from("Parsed config was not table"))?;
-                    for (key, _) in table {
+                    for key in table.keys() {
                         match &**key {
                             $(
                                 stringify!($i) => (),
@@ -619,6 +619,7 @@ pub fn get_toml_path(dir: &Path) -> Result<Option<PathBuf>, Error> {
         "Force multiline closure bodies to be wrapped in a block";
     multiline_match_arm_forces_block: bool, false,
         "Force multiline match arm bodies to be wrapped in a block";
+    merge_derives: bool, true, "Merge multiple `#[derive(...)]` into a single one";
 }
 
 #[cfg(test)]