Refactor record matcher

.github/workflows/ci.yml

@@ -89,12 +89,13 @@ jobs:
     strategy:
       matrix:
         item:
-          - { name: pica-format, fuzz-dir: crates/pica-format/fuzz, target: fuzz-format, max-total-time: 300 }
-          - { name: pica-path, fuzz-dir: crates/pica-path/fuzz, target: fuzz-path, max-total-time: 300 }
-          - { name: pica-record-matcher, fuzz-dir: crates/pica-matcher/fuzz, target: fuzz-record-matcher, max-total-time: 300 }
-          - { name: pica-record-ref-v1, fuzz-dir: crates/pica-record-v1/fuzz, target: fuzz-record-ref, max-total-time: 300 }
-          - { name: pica-select-query, fuzz-dir: crates/pica-select/fuzz, target: fuzz-query, max-total-time: 300 }
-          - { name: pica-record-ref, fuzz-dir: fuzz, target: fuzz-record-ref, max-total-time: 300 }
+          - { name: pica-format, fuzz-dir: crates/pica-format/fuzz, target: fuzz-format, max-total-time: 120 }
+          - { name: pica-path, fuzz-dir: crates/pica-path/fuzz, target: fuzz-path, max-total-time: 120 }
+          - { name: pica-record-matcher-v1, fuzz-dir: crates/pica-matcher/fuzz, target: fuzz-record-matcher, max-total-time: 120 }
+          - { name: pica-record-ref-v1, fuzz-dir: crates/pica-record-v1/fuzz, target: fuzz-record-ref, max-total-time: 120 }
+          - { name: pica-select-query, fuzz-dir: crates/pica-select/fuzz, target: fuzz-query, max-total-time: 120 }
+          - { name: pica-record-ref, fuzz-dir: fuzz, target: fuzz-record-ref, max-total-time: 400 }
+          - { name: pica-record-matcher, fuzz-dir: fuzz, target: fuzz-record-matcher, max-total-time: 400 }
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@nightly

crates/pica-record-v1/src/io/reader.rs

@@ -142,7 +142,10 @@ pub trait RecordsIterator {
 }
 
 impl<R: Read> RecordsIterator for Reader<R> {
-    type Item<'a> = Result<ByteRecord<'a>, ReadPicaError> where Self: 'a;
+    type Item<'a>
+        = Result<ByteRecord<'a>, ReadPicaError>
+    where
+        Self: 'a;
 
     fn next(&mut self) -> Option<Self::Item<'_>> {
         if self.limit > 0 && self.count >= self.limit {

fuzz/Cargo.toml

@@ -21,3 +21,10 @@ path = "fuzz_targets/fuzz_record_ref.rs"
 test = false
 doc = false
 bench = false
+
+[[bin]]
+name = "fuzz-record-matcher"
+path = "fuzz_targets/fuzz_record_matcher.rs"
+test = false
+doc = false
+bench = false

fuzz/fuzz_targets/fuzz_record_matcher.rs

@@ -0,0 +1,10 @@
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+use pica_record::prelude::*;
+
+fuzz_target!(|data: &[u8]| {
+    if let Ok(s) = std::str::from_utf8(data) {
+        let _ = RecordMatcher::new(s);
+    }
+});

src/matcher/field/mod.rs

@@ -19,7 +19,7 @@ use super::{
 use crate::prelude::SubfieldMatcher;
 use crate::primitives::FieldRef;
 
-mod parser;
+pub(crate) mod parser;
 
 /// A matcher that checks if a field exists.
 #[derive(Debug, Clone, PartialEq)]
@@ -561,8 +561,7 @@ impl BitAnd for FieldMatcher {
 }
 
 impl BitAndAssign for FieldMatcher {
-    /// The bitwise AND assignment operator `&=` of two
-    /// [FieldMatcher].
+    /// The bitwise AND assignment operator `&=` of two [FieldMatcher].
     ///
     /// # Example
     ///

src/matcher/field/parser.rs

@@ -321,7 +321,7 @@ fn parse_field_composite_matcher(
 }
 
 /// Parse a [FieldMatcher] expression.
-pub(super) fn parse_field_matcher(
+pub(crate) fn parse_field_matcher(
     i: &mut &[u8],
 ) -> PResult<FieldMatcher> {
     ws(alt((

src/matcher/mod.rs

@@ -5,6 +5,7 @@ pub use occurrence::OccurrenceMatcher;
 pub use operator::{BooleanOp, RelationalOp};
 pub use options::MatcherOptions;
 pub use quantifier::Quantifier;
+pub use record::RecordMatcher;
 pub use tag::TagMatcher;
 
 mod error;
@@ -13,5 +14,6 @@ mod occurrence;
 mod operator;
 mod options;
 mod quantifier;
+mod record;
 pub mod subfield;
 mod tag;