From 560b66bd51271210f9d8bc340fd80f54b9989026 Mon Sep 17 00:00:00 2001 From: Mroik Date: Thu, 30 Jan 2025 04:17:16 +0100 Subject: Fix some clippy stuff --- src/app.rs | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/app.rs b/src/app.rs index a2a42c9..ea7cf05 100644 --- a/src/app.rs +++ b/src/app.rs @@ -77,7 +77,7 @@ impl App<'_> { let mut counter = 0; let mut lines = Vec::new(); let mut line = Vec::new(); - for w in quote.trim().split_whitespace().filter(|s| !s.is_empty()) { + for w in quote.split_whitespace().filter(|s| !s.is_empty()) { let w_len = w.chars().count(); if w_len > max as usize { return Err(WordTooLongError::new(w)); @@ -322,21 +322,25 @@ impl App<'_> { } self.stdout.queue(SavePosition)?; - if cc.len() < vv.len() { - self.stdout.queue(SetForegroundColor(Color::Yellow))?; - let remaining = vv.iter().skip(cc.len()).fold(String::new(), |mut a, b| { - a.push(*b); - a - }); - self.stdout.queue(Print(remaining))?; - self.stdout.queue(SavePosition)?; - } else if cc.len() > vv.len() { - self.stdout.queue(SetForegroundColor(Color::Reset))?; - let remaining = cc.iter().skip(vv.len()).fold(String::new(), |mut a, b| { - a.push(*b); - a - }); - self.stdout.queue(Print(remaining))?; + match (cc.len(), vv.len()) { + (ccc, vvv) if ccc < vvv => { + self.stdout.queue(SetForegroundColor(Color::Yellow))?; + let remaining = vv.iter().skip(cc.len()).fold(String::new(), |mut a, b| { + a.push(*b); + a + }); + self.stdout.queue(Print(remaining))?; + self.stdout.queue(SavePosition)?; + } + (ccc, vvv) if ccc > vvv => { + self.stdout.queue(SetForegroundColor(Color::Reset))?; + let remaining = cc.iter().skip(vv.len()).fold(String::new(), |mut a, b| { + a.push(*b); + a + }); + self.stdout.queue(Print(remaining))?; + } + (_, _) => (), } self.stdout.queue(Print(' '))?; } -- cgit v1.3