Migrate parser code to winnow (#707)

deutsche-nationalbibliothek · Nov 19, 2023 · d147808 · d147808
1 parent 10916aa
commit d147808
Show file tree

Hide file tree

Showing 34 changed files with 3,033 additions and 3,436 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -125,7 +125,7 @@ jobs:
       matrix:
         item:
           - { name: record_ref, fuzz-dir: crates/pica-record/fuzz, target: fuzz_record_ref, max-total-time: 300 }
-          - { name: select_query, fuzz-dir: crates/pica-select/fuzz, target: fuzz_query, max-total-time: 300 }
+          # - { name: select_query, fuzz-dir: crates/pica-select/fuzz, target: fuzz_query, max-total-time: 300 }
     steps:
       - uses: actions/checkout@v4
       - uses: abbbi/github-actions-tune@v1

diff --git a/Cargo.toml b/Cargo.toml
@@ -43,6 +43,7 @@ serde_json = "1.0"
 sha2 = "0.10"
 thiserror = "1.0"
 toml = "0.8"
+winnow = "0.5"
 
 [profile.release]
 codegen-units = 1

diff --git a/crates/pica-lint/src/lints/refcheck.rs b/crates/pica-lint/src/lints/refcheck.rs
@@ -32,7 +32,7 @@ impl Lint for RefCheck {
 
             if insert {
                 for value in values {
-                    self.seen.insert(value.to_owned().into());
+                    self.seen.insert(value.to_owned());
                 }
             }
         }
@@ -48,9 +48,9 @@ impl Lint for RefCheck {
             for value in values {
                 let idn = record.idn().unwrap().to_owned();
                 self.unseen
-                    .entry(value.to_owned().into())
-                    .and_modify(|e| e.push(idn.into()))
-                    .or_insert_with(|| vec![idn.into()]);
+                    .entry(value.to_owned())
+                    .and_modify(|e| e.push(idn.clone()))
+                    .or_insert_with(|| vec![idn]);
             }
         }
 

diff --git a/crates/pica-matcher/Cargo.toml b/crates/pica-matcher/Cargo.toml
@@ -9,17 +9,16 @@ edition.workspace = true
 
 [dependencies]
 bstr = { workspace = true }
-nom = { workspace = true }
 pica-record = { workspace = true }
 regex = { workspace = true }
 serde = { workspace = true, optional = true }
 strsim = "0.10"
 thiserror = { workspace = true }
+winnow = { workspace = true, features = ["simd"] }
 
 [dev-dependencies]
 anyhow = "1.0"
 criterion = { version = "0.5", features = ["html_reports"] }
-nom-test-helpers = "6.1"
 
 [features]
 serde = ["dep:serde"]