mirror of
https://github.com/FliegendeWurst/cursive.git
synced 2024-11-27 11:16:03 +00:00
use Iterator::sum() for summing instead of fold
This commit is contained in:
parent
5f5fb4e502
commit
36d5aa016a
@ -51,7 +51,7 @@ pub fn prefix<'a, I>(iter: I, available_width: usize, delimiter: &str) -> Prefix
|
|||||||
// `current_width` is the width of everything
|
// `current_width` is the width of everything
|
||||||
// before the next token, including any space.
|
// before the next token, including any space.
|
||||||
let mut current_width = 0;
|
let mut current_width = 0;
|
||||||
let sum = iter.take_while(|token| {
|
let sum: usize = iter.take_while(|token| {
|
||||||
let width = token.width();
|
let width = token.width();
|
||||||
if current_width + width > available_width {
|
if current_width + width > available_width {
|
||||||
false
|
false
|
||||||
@ -63,7 +63,7 @@ pub fn prefix<'a, I>(iter: I, available_width: usize, delimiter: &str) -> Prefix
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.map(|token| token.len() + delimiter_len)
|
.map(|token| token.len() + delimiter_len)
|
||||||
.fold(0, |a, b| a + b);
|
.sum();
|
||||||
|
|
||||||
// We counted delimiter once too many times,
|
// We counted delimiter once too many times,
|
||||||
// but only if the iterator was non empty.
|
// but only if the iterator was non empty.
|
||||||
|
Loading…
Reference in New Issue
Block a user