Mirrors/choose
2
0
Fork 0
mirror of https://github.com/theryangeary/choose synced 2024-11-10 05:24:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Apply clippy suggestions

Browse source
This commit is contained in:
Ryan Geary 2021-07-12 21:22:53 -04:00
parent e31a1f1c04
commit 4c30976bf4
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/choice.rs
View file

@ -1,5 +1,4 @@
use std::convert::TryInto; use std::convert::TryInto;
use std::iter::FromIterator;
use crate::config::Config; use crate::config::Config;
use crate::writeable::Writeable; use crate::writeable::Writeable;
@ -121,7 +120,7 @@ impl Choice {
T: Writeable, T: Writeable,
I: Iterator<Item = T>, I: Iterator<Item = T>,
{ {
let vec = Vec::from_iter(iter); let vec = iter.collect::<Vec<_>>();
let (start, end) = self.get_negative_start_end(&vec); let (start, end) = self.get_negative_start_end(&vec);
if end > start { if end > start {
@ -170,20 +169,19 @@ impl Choice {
} }
let mut peek_iter = stack.iter().rev().peekable(); let mut peek_iter = stack.iter().rev().peekable();
loop { while let Some(s) = peek_iter.next() {
match peek_iter.next() { handle.write_choice(*s, config, peek_iter.peek().is_some())?;
Some(s) => handle.write_choice(*s, config, peek_iter.peek().is_some())?,
None => break,
}
} }
Ok(()) Ok(())
} }
fn get_negative_start_end<T>(&self, vec: &Vec<T>) -> (usize, usize) { fn get_negative_start_end<T>(&self, slice: &[T]) -> (usize, usize) {
let start = if self.start >= 0 { let start = if self.start >= 0 {
self.start.try_into().unwrap() self.start.try_into().unwrap()
} else { } else {
vec.len() slice
.len()
.checked_sub(self.start.abs().try_into().unwrap()) .checked_sub(self.start.abs().try_into().unwrap())
.unwrap() .unwrap()
}; };
@ -191,7 +189,8 @@ impl Choice {
let end = if self.end >= 0 { let end = if self.end >= 0 {
self.end.try_into().unwrap() self.end.try_into().unwrap()
} else { } else {
vec.len() slice
.len()
.checked_sub(self.end.abs().try_into().unwrap()) .checked_sub(self.end.abs().try_into().unwrap())
.unwrap() .unwrap()
}; };