rustfmt

Author: ratmice

nimbleparse/src/main.rs

@@ -554,76 +554,78 @@ where
         } else {
             // If given no input paths, try to find some with `test_files` in the header.
             match self.header.get("test_files") {
-            Some(HeaderValue(_, Value::Setting(Setting::Array(test_globs, _, _)))) => {
-                for setting in test_globs {
-                    match setting {
-                        Setting::String(s, _) => {
-                            if let Some(yacc_y_path_dir) = self.yacc_y_path.parent() {
-                                let joined = yacc_y_path_dir.join(s);
-                                let joined = joined.as_os_str().to_str();
-                                if let Some(s) = joined {
-                                    let mut glob_paths = glob::glob(s)?.peekable();
-                                    if glob_paths.peek().is_none() {
-                                        return Err(NimbleparseError::Other(
-                                            format!("'test_files' glob '{}' matched no paths", s)
+                Some(HeaderValue(_, Value::Setting(Setting::Array(test_globs, _, _)))) => {
+                    for setting in test_globs {
+                        match setting {
+                            Setting::String(s, _) => {
+                                if let Some(yacc_y_path_dir) = self.yacc_y_path.parent() {
+                                    let joined = yacc_y_path_dir.join(s);
+                                    let joined = joined.as_os_str().to_str();
+                                    if let Some(s) = joined {
+                                        let mut glob_paths = glob::glob(s)?.peekable();
+                                        if glob_paths.peek().is_none() {
+                                            return Err(NimbleparseError::Other(
+                                                format!(
+                                                    "'test_files' glob '{}' matched no paths",
+                                                    s
+                                                )
                                                 .to_string()
                                                 .into(),
-                                        ));
-                                    }
-                                    for path in glob_paths {
-                                        let path = path?;
-                                        if let Some(ext) = path.extension() {
-                                            if let Some(ext) = ext.to_str() {
-                                                if ext.starts_with("grm") {
-                                                    Err(NimbleparseError::Other(
+                                            ));
+                                        }
+                                        for path in glob_paths {
+                                            let path = path?;
+                                            if let Some(ext) = path.extension() {
+                                                if let Some(ext) = ext.to_str() {
+                                                    if ext.starts_with("grm") {
+                                                        Err(NimbleparseError::Other(
                                                         "test_files extensions beginning with `grm` are reserved."
                                                         .into(),
                                                     ))?
+                                                    }
                                                 }
                                             }
+                                            paths.push(path);
                                         }
-                                        paths.push(path);
-                                    }
-                                } else {
-                                    return Err(NimbleparseError::Other(
+                                    } else {
+                                        return Err(NimbleparseError::Other(
                                         format!(
                                             "Unable to convert joined path to str {} with glob '{}'",
                                             self.yacc_y_path.display(),
                                             s
                                         )
                                         .into(),
                                     ));
+                                    }
+                                } else {
+                                    return Err(NimbleparseError::Other(
+                                        format!(
+                                            "Unable to find parent path for {}",
+                                            self.yacc_y_path.display()
+                                        )
+                                        .into(),
+                                    ));
                                 }
-                            } else {
+                            }
+
+                            _ => {
                                 return Err(NimbleparseError::Other(
-                                    format!(
-                                        "Unable to find parent path for {}",
-                                        self.yacc_y_path.display()
-                                    )
-                                    .into(),
+                                    "Expected string values in `test_files`".into(),
                                 ));
                             }
                         }
-
-                        _ => {
-                            return Err(NimbleparseError::Other(
-                                "Expected string values in `test_files`".into(),
-                            ));
-                        }
                     }
                 }
-            } 
-            Some(_) => {
-                            return Err(NimbleparseError::Other(
-                                "Expected Array of string values in `test_files`".into(),
-                            ));
-
-            }
-            None => {
-                return Err(NimbleparseError::Other(
-                    "Missing <input file> argument".into(),
-                ));
-            }
+                Some(_) => {
+                    return Err(NimbleparseError::Other(
+                        "Expected Array of string values in `test_files`".into(),
+                    ));
+                }
+                None => {
+                    return Err(NimbleparseError::Other(
+                        "Missing <input file> argument".into(),
+                    ));
+                }
             }
         };
         if paths.is_empty() {