From 24d314872062c9e9ea4e1de413e4a6d56474fb20 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Mon, 23 Jan 2023 15:13:36 +0100 Subject: [PATCH] Apply clippy suggestions --- instant-segment/examples/merge.rs | 4 ++-- instant-segment/src/lib.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/instant-segment/examples/merge.rs b/instant-segment/examples/merge.rs index f494ca4..9702524 100644 --- a/instant-segment/examples/merge.rs +++ b/instant-segment/examples/merge.rs @@ -25,7 +25,7 @@ fn process_bigrams(word_list: &HashSet) { .into_par_iter() .map(|part| { let fname = format!("data/cache/eng-2-{:05}-{:05}.txt", part, BIGRAM_PARTS); - let f = File::open(&fname).unwrap(); + let f = File::open(fname).unwrap(); let mut reader = BufReader::with_capacity(4 * 1024 * 1024, f); let mut ln = String::new(); @@ -124,7 +124,7 @@ fn process_unigrams(word_list: &HashSet) { .into_par_iter() .map(|part| { let fname = format!("data/cache/eng-1-{:05}-{:05}.txt", part, UNIGRAM_PARTS); - let f = File::open(&fname).unwrap(); + let f = File::open(fname).unwrap(); let mut reader = BufReader::with_capacity(4 * 1024 * 1024, f); let mut ln = String::new(); diff --git a/instant-segment/src/lib.rs b/instant-segment/src/lib.rs index adad82b..cb27cd1 100644 --- a/instant-segment/src/lib.rs +++ b/instant-segment/src/lib.rs @@ -128,7 +128,7 @@ impl<'a> SegmentState<'a> { 0 => (None, 0.0), _ => { let prefix = self.search.candidates[split - 1]; - let word = &self.text[split - prefix.len as usize..split]; + let word = &self.text[split - prefix.len..split]; (Some(word), prefix.score) } }; @@ -152,10 +152,10 @@ impl<'a> SegmentState<'a> { let mut end = self.text.len(); let mut best = self.search.candidates[end - 1]; loop { - let word = &self.text[end - best.len as usize..end]; + let word = &self.text[end - best.len..end]; self.search.result.push(word.into()); - end -= best.len as usize; + end -= best.len; if end == 0 { break; }