Address comments

Cargo.toml

@@ -17,7 +17,7 @@ tracing = "0.1"
 tracing-subscriber = "0.3"
 
 [dev-dependencies]
-include_dir = "0.7"
+include_dir = {version  = "0.7", features = ["glob"]}
 insta = "1"
 
 [profile.release]

src/ldlm/mod.rs

@@ -1,4 +1,4 @@
-// Copyright (c) 2023 DDN. All rights reserved.
+// Copyright (c) 2024 DDN. All rights reserved.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 

src/llite/mod.rs

@@ -7,7 +7,7 @@ use crate::{
     stats_parser::stats,
     Param, Record, Stat, Target, TargetStats,
 };
-use combine::{attempt, choice, parser::char::string, ParseError, Parser, Stream};
+use combine::{parser::char::string, ParseError, Parser, Stream};
 
 pub(crate) const LLITE: &str = "llite";
 pub(crate) const STATS: &str = "stats";
@@ -25,7 +25,7 @@ where
     I::Error: ParseError<I::Token, I::Range, I::Position>,
 {
     (
-        attempt(string(LLITE)).skip(period()),
+        string(LLITE).skip(period()),
         target().skip(period()),
     )
         .map(|(_, x)| x)
@@ -41,7 +41,7 @@ where
     I: Stream<Token = char>,
     I::Error: ParseError<I::Token, I::Range, I::Position>,
 {
-    choice(((param(STATS), stats().map(LliteStat::Stats)).message("while parsing llite_stat"),))
+    (param(STATS), stats().map(LliteStat::Stats)).message("while parsing llite_stat")
 }
 
 pub(crate) fn parse<I>() -> impl Parser<I, Output = Record>

src/parser.rs

@@ -50,21 +50,26 @@ mod tests {
     use include_dir::{include_dir, Dir};
     use insta::assert_debug_snapshot;
 
-    static VALID_FIXTURES: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/src/fixtures/valid");
+    static VALID_FIXTURES: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/src/fixtures/valid/");
 
     #[test]
     fn test_valid_fixtures() {
-        for file in VALID_FIXTURES.files() {
-            let name = file.path().file_name().unwrap().to_string_lossy();
+        for dir in VALID_FIXTURES.find("*").unwrap() {
+            match dir {
+                include_dir::DirEntry::Dir(_) => {},
+                include_dir::DirEntry::File(file) => {
+                    let name = file.path().to_string_lossy();
 
-            let contents = file.contents_utf8().unwrap();
+                    let contents = file.contents_utf8().unwrap();
 
-            let result = parse()
-                .easy_parse(contents)
-                .map_err(|err| err.map_position(|p| p.translate_position(contents)))
-                .unwrap();
+                    let result = parse()
+                        .easy_parse(contents)
+                        .map_err(|err| err.map_position(|p| p.translate_position(contents)))
+                        .unwrap();
 
-            assert_debug_snapshot!(format!("valid_fixture_{name}"), result);
+                    assert_debug_snapshot!(format!("valid_fixture_{name}"), result);
+                }
+            }
         }
     }