From 1fd46c1e9bfab2deac23e5c18d71f84e6c926850 Mon Sep 17 00:00:00 2001 From: Paul Masurel Date: Mon, 28 Jan 2019 03:46:23 +0100 Subject: [PATCH] Clippy --- src/common/vint.rs | 4 ++-- src/core/segment_component.rs | 2 +- src/query/intersection.rs | 4 ++-- src/tokenizer/stemmer.rs | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/common/vint.rs b/src/common/vint.rs index 965a8a0d9..65dfd72ba 100644 --- a/src/common/vint.rs +++ b/src/common/vint.rs @@ -69,8 +69,8 @@ pub fn serialize_vint_u32(val: u32) -> (u64, usize) { /// # May Panic /// If the payload does not start by a valid `vint` fn vint_len(data: &[u8]) -> usize { - for i in 0..5.min(data.len()) { - if data[i] >= STOP_BIT { + for (i, &val) in data.iter().enumerate().take(5) { + if val >= STOP_BIT { return i + 1; } } diff --git a/src/core/segment_component.rs b/src/core/segment_component.rs index 29b0250ba..d605a355e 100644 --- a/src/core/segment_component.rs +++ b/src/core/segment_component.rs @@ -41,6 +41,6 @@ impl SegmentComponent { SegmentComponent::STORE, SegmentComponent::DELETE, ]; - SEGMENT_COMPONENTS.into_iter() + SEGMENT_COMPONENTS.iter() } } diff --git a/src/query/intersection.rs b/src/query/intersection.rs index e38d32ec7..aef6d9e59 100644 --- a/src/query/intersection.rs +++ b/src/query/intersection.rs @@ -26,8 +26,8 @@ pub fn intersect_scorers(mut scorers: Vec>) -> Box { (Some(single_docset), None) => single_docset, (Some(left), Some(right)) => { { - let all_term_scorers = [&left, &right].into_iter().all(|scorer| { - let scorer_ref: &Scorer = (*scorer).borrow(); + let all_term_scorers = [&left, &right].iter().all(|&scorer| { + let scorer_ref: &Scorer = as Borrow>::borrow(scorer); Downcast::::is_type(scorer_ref) }); if all_term_scorers { diff --git a/src/tokenizer/stemmer.rs b/src/tokenizer/stemmer.rs index dbb15c554..a1fa99fd8 100644 --- a/src/tokenizer/stemmer.rs +++ b/src/tokenizer/stemmer.rs @@ -27,9 +27,8 @@ pub enum Language { } impl Language { - fn algorithm(&self) -> Algorithm { + fn algorithm(self) -> Algorithm { use self::Language::*; - match self { Arabic => Algorithm::Arabic, Danish => Algorithm::Danish,