From d75762fa792d106d83cb467058eeda24ef7f48d5 Mon Sep 17 00:00:00 2001 From: Nico Wagner Date: Mon, 2 Sep 2024 08:07:45 +0000 Subject: [PATCH] make clippy happy Signed-off-by: Nico Wagner --- crates/pica-format/src/lib.rs | 4 ++-- crates/pica-matcher/src/subfield_matcher.rs | 10 +++++----- crates/pica-path/src/lib.rs | 4 ++-- crates/pica-select/src/lib.rs | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/crates/pica-format/src/lib.rs b/crates/pica-format/src/lib.rs index 27a18de87..e1e7e3fb4 100644 --- a/crates/pica-format/src/lib.rs +++ b/crates/pica-format/src/lib.rs @@ -135,7 +135,7 @@ impl Formatter for Value { subfield: &SubfieldRef, options: &FormatOptions, ) -> String { - if !self.codes.contains(&subfield.code()) { + if !self.codes.contains(subfield.code()) { return "".into(); } @@ -164,7 +164,7 @@ impl Formatter for Value { let mut cnt = 0; for subfield in field.subfields().iter() { - if !self.codes.contains(&subfield.code()) { + if !self.codes.contains(subfield.code()) { continue; } diff --git a/crates/pica-matcher/src/subfield_matcher.rs b/crates/pica-matcher/src/subfield_matcher.rs index 258540eb5..4d1bfd1a8 100644 --- a/crates/pica-matcher/src/subfield_matcher.rs +++ b/crates/pica-matcher/src/subfield_matcher.rs @@ -45,7 +45,7 @@ fn parse_subfield_code_range( .verify(|(min, max)| min < max) .map(|(min, max)| { (min.as_byte()..=max.as_byte()) - .map(|code| SubfieldCode::from_unchecked(code)) + .map(SubfieldCode::from_unchecked) .collect() }) .parse_next(i) @@ -181,7 +181,7 @@ impl ExistsMatcher { ) -> bool { subfields .into_iter() - .any(|subfield| self.codes.contains(&subfield.code())) + .any(|subfield| self.codes.contains(subfield.code())) } } @@ -255,7 +255,7 @@ impl RelationMatcher { let mut subfields = subfields .into_iter() - .filter(|s| self.codes.contains(&s.code())); + .filter(|s| self.codes.contains(s.code())); let check = |subfield: &SubfieldRef| -> bool { let value = subfield.value().as_ref(); @@ -485,7 +485,7 @@ impl RegexMatcher { let mut subfields = subfields .into_iter() - .filter(|s| self.codes.contains(&s.code())); + .filter(|s| self.codes.contains(s.code())); let check_fn = |subfield: &SubfieldRef| -> bool { let mut result = re.is_match(subfield.value().as_ref()); @@ -629,7 +629,7 @@ impl InMatcher { ) -> bool { let mut subfields = subfields .into_iter() - .filter(|s| self.codes.contains(&s.code())); + .filter(|s| self.codes.contains(s.code())); let check_fn = |subfield: &SubfieldRef| -> bool { let mut result = self.values.iter().any(|rhs| { diff --git a/crates/pica-path/src/lib.rs b/crates/pica-path/src/lib.rs index 7b996fc18..5692c8b84 100644 --- a/crates/pica-path/src/lib.rs +++ b/crates/pica-path/src/lib.rs @@ -155,7 +155,7 @@ fn parse_subfield_code_range( .verify(|(min, max)| min < max) .map(|(min, max)| { (min.as_byte()..=max.as_byte()) - .map(|code| SubfieldCode::from_unchecked(code)) + .map(SubfieldCode::from_unchecked) .collect() }) .parse_next(i) @@ -361,7 +361,7 @@ impl<'a> PathExt for RecordRef<'a> { }) .flat_map(FieldRef::subfields) .filter_map(|subfield| { - if path.codes_flat().contains(&subfield.code()) { + if path.codes_flat().contains(subfield.code()) { Some(subfield.value()) } else { None diff --git a/crates/pica-select/src/lib.rs b/crates/pica-select/src/lib.rs index 858c8b60b..2f570171d 100644 --- a/crates/pica-select/src/lib.rs +++ b/crates/pica-select/src/lib.rs @@ -485,7 +485,7 @@ impl QueryExt for RecordRef<'_> { .iter() .filter(|subfield| { codes.contains( - &subfield.code(), + subfield.code(), ) }) .map(|subfield| {