refactor: clean up some folds (#362)

src/buffer.rs

@@ -139,9 +139,11 @@ impl Buffer {
         S: AsRef<str>,
     {
         let height = lines.len() as u16;
-        let width = lines.iter().fold(0, |acc, item| {
-            std::cmp::max(acc, item.as_ref().width() as u16)
-        });
+        let width = lines
+            .iter()
+            .map(|i| i.as_ref().width() as u16)
+            .max()
+            .unwrap_or_default();
         let mut buffer = Buffer::empty(Rect {
             x: 0,
             y: 0,

src/text.rs

@@ -47,7 +47,7 @@
 //! ]);
 //! ```
 use crate::style::Style;
-use std::{borrow::Cow, cmp::max};
+use std::borrow::Cow;
 use unicode_segmentation::UnicodeSegmentation;
 use unicode_width::UnicodeWidthStr;
 
@@ -218,7 +218,7 @@ impl<'a> Spans<'a> {
     /// assert_eq!(7, spans.width());
     /// ```
     pub fn width(&self) -> usize {
-        self.0.iter().fold(0, |acc, s| acc + s.width())
+        self.0.iter().map(Span::width).sum()
     }
 }
 
@@ -279,7 +279,11 @@ impl<'a> Text<'a> {
     /// assert_eq!(15, text.width());
     /// ```
     pub fn width(&self) -> usize {
-        self.lines.iter().fold(0, |acc, l| max(acc, l.width()))
+        self.lines
+            .iter()
+            .map(Spans::width)
+            .max()
+            .unwrap_or_default()
     }
 
     /// Returns the height.

src/widgets/barchart.rs

@@ -5,7 +5,7 @@ use crate::{
     symbols,
     widgets::{Block, Widget},
 };
-use std::cmp::{max, min};
+use std::cmp::min;
 use unicode_width::UnicodeWidthStr;
 
 /// Display multiple bars in a single widgets
@@ -145,7 +145,7 @@ impl<'a> Widget for BarChart<'a> {
 
         let max = self
             .max
-            .unwrap_or_else(|| self.data.iter().fold(0, |acc, &(_, v)| max(v, acc)));
+            .unwrap_or_else(|| self.data.iter().map(|t| t.1).max().unwrap_or_default());
         let max_index = min(
             (chart_area.width / (self.bar_width + self.bar_gap)) as usize,
             self.data.len(),

src/widgets/chart.rs

@@ -297,10 +297,7 @@ impl<'a> Chart<'a> {
         }
 
         if let Some(ref y_labels) = self.y_axis.labels {
-            let mut max_width = y_labels
-                .iter()
-                .fold(0, |acc, l| max(l.content.width(), acc))
-                as u16;
+            let mut max_width = y_labels.iter().map(Span::width).max().unwrap_or_default() as u16;
             if let Some(ref x_labels) = self.x_axis.labels {
                 if !x_labels.is_empty() {
                     max_width = max(max_width, x_labels[0].content.width() as u16);
@@ -397,7 +394,7 @@ impl<'a> Widget for Chart<'a> {
 
         if let Some(y) = layout.label_x {
             let labels = self.x_axis.labels.unwrap();
-            let total_width = labels.iter().fold(0, |acc, l| l.content.width() + acc) as u16;
+            let total_width = labels.iter().map(Span::width).sum::<usize>() as u16;
             let labels_len = labels.len() as u16;
             if total_width < graph_area.width && labels_len > 1 {
                 for (i, label) in labels.iter().enumerate() {