refactor: use map_or_else

src/app_data/mod.rs

@@ -66,12 +66,12 @@ impl AppData {
     pub fn set_sorted(&mut self, x: Option<(Header, SortedOrder)>) {
         self.sorted_by = x;
         self.sort_containers();
-        self.containers.state.select(
+        self.containers
-            self.containers
+            .state
-                .items
+            .select(self.containers.items.iter().position(|i| {
-                .iter()
+                self.get_selected_container_id()
-                .position(|i| Some(i.id.clone()) == self.get_selected_container_id()),
+                    .map_or_else(|| false, |id| i.id == id)
-        );
+            }));
     }
     /// Generate a default app_state
     pub fn default(args: CliArgs) -> Self {

src/docker_data/mod.rs

@@ -78,9 +78,8 @@ impl DockerData {
                     .cpu_stats
                     .cpu_usage
                     .percpu_usage
-                    .clone()
+                    .as_ref()
-                    .unwrap_or_default()
+                    .map_or_else(|| 0, |i| i.len()) as u64
-                    .len() as u64
             }) as f64;
             if system_delta > 0.0 && cpu_delta > 0.0 {
                 cpu_percentage = (cpu_delta / system_delta) * online_cpus * 100.0;

src/input_handler/mod.rs

@@ -137,7 +137,7 @@ impl InputHandler {
     }
 
     /// Handle any keyboard button events
-	#[allow(clippy::too_many_lines)]
+    #[allow(clippy::too_many_lines)]
     async fn button_press(&mut self, key_code: KeyCode) {
         let show_error = self.app_data.lock().show_error;
         let show_info = self.gui_state.lock().show_help;

src/ui/draw_blocks.rs

@@ -443,7 +443,10 @@ pub fn heading_bar<B: Backend>(
     let column_width = usize::from(area.width) - info_width;
     let column_width = if column_width > 0 { column_width } else { 1 };
     let splits = if has_containers {
-        vec![Constraint::Min(column_width.try_into().unwrap_or_default()), Constraint::Min(info_width.try_into().unwrap_or_default())]
+        vec![
+            Constraint::Min(column_width.try_into().unwrap_or_default()),
+            Constraint::Min(info_width.try_into().unwrap_or_default()),
+        ]
     } else {
         vec![Constraint::Percentage(100)]
     };
@@ -541,19 +544,20 @@ pub fn help_box<B: Backend>(f: &mut Frame<'_, B>) {
         .border_type(BorderType::Rounded)
         .border_style(Style::default().fg(Color::Black));
 
-    let area = popup(
+    let area = popup(lines, max_line_width, f.size(), BoxLocation::MiddleCentre);
-        lines,
-        max_line_width,
-        f.size(),
-        BoxLocation::MiddleCentre,
-    );
 
     let split_popup = Layout::default()
         .direction(Direction::Vertical)
         .constraints(
             [
                 Constraint::Max(NAME_TEXT.lines().count().try_into().unwrap_or_default()),
-                Constraint::Max(description_text.lines().count().try_into().unwrap_or_default()),
+                Constraint::Max(
+                    description_text
+                        .lines()
+                        .count()
+                        .try_into()
+                        .unwrap_or_default(),
+                ),
                 Constraint::Max(help_text.lines().count().try_into().unwrap_or_default()),
             ]
             .as_ref(),
@@ -605,12 +609,7 @@ pub fn error<B: Backend>(f: &mut Frame<'_, B>, error: AppError, seconds: Option<
         .block(block)
         .alignment(Alignment::Center);
 
-    let area = popup(
+    let area = popup(lines, max_line_width, f.size(), BoxLocation::MiddleCentre);
-        lines,
-        max_line_width,
-        f.size(),
-        BoxLocation::MiddleCentre,
-    );
     f.render_widget(Clear, area);
     f.render_widget(paragraph, area);
 }
@@ -634,12 +633,7 @@ pub fn info<B: Backend>(f: &mut Frame<'_, B>, text: String) {
         .block(block)
         .alignment(Alignment::Center);
 
-    let area = popup(
+    let area = popup(lines, max_line_width, f.size(), BoxLocation::BottomRight);
-        lines,
-        max_line_width,
-        f.size(),
-        BoxLocation::BottomRight,
-    );
     f.render_widget(Clear, area);
     f.render_widget(paragraph, area);
 }
@@ -658,8 +652,14 @@ fn popup(text_lines: usize, text_width: usize, r: Rect, box_location: BoxLocatio
         1
     };
 
-    let v_constraints = box_location.get_vertical_constraints(blank_vertical.try_into().unwrap_or_default(), text_lines.try_into().unwrap_or_default());
+    let v_constraints = box_location.get_vertical_constraints(
-    let h_constraints = box_location.get_horizontal_constraints(blank_horizontal.try_into().unwrap_or_default(), text_width.try_into().unwrap_or_default());
+        blank_vertical.try_into().unwrap_or_default(),
+        text_lines.try_into().unwrap_or_default(),
+    );
+    let h_constraints = box_location.get_horizontal_constraints(
+        blank_horizontal.try_into().unwrap_or_default(),
+        text_width.try_into().unwrap_or_default(),
+    );
 
     let indexes = box_location.get_indexes();
 

src/ui/mod.rs

@@ -168,7 +168,13 @@ fn ui<B: Backend>(
     // Split into 3, containers+controls, logs, then graphs
     let upper_main = Layout::default()
         .direction(Direction::Vertical)
-        .constraints([Constraint::Max(height.try_into().unwrap_or_default()), Constraint::Percentage(50)].as_ref())
+        .constraints(
+            [
+                Constraint::Max(height.try_into().unwrap_or_default()),
+                Constraint::Percentage(50),
+            ]
+            .as_ref(),
+        )
         .split(whole_layout[1]);
 
     let top_split = if has_containers {