refactor: somewhat migrate to Rust 2024 edition (#1681)

* refactor: try bumping to rust 2024 edition

* now run nightly fmt

* fix some macos changes

* only apply a few of these settings

build.rs

@@ -10,7 +10,7 @@ use std::{
 };
 
 use clap::{Command, CommandFactory};
-use clap_complete::{generate_to, shells::Shell, Generator};
+use clap_complete::{Generator, generate_to, shells::Shell};
 use clap_complete_fig::Fig;
 use clap_complete_nushell::Nushell;
 

rustfmt.toml

@@ -5,6 +5,7 @@ fn_params_layout = "Compressed"
 use_field_init_shorthand = true
 tab_spaces = 4
 max_width = 100
+style_edition = "2024"
 
 # Unstable options, disabled by default.
 # imports_granularity = "Crate"

src/app/data/process.rs

@@ -1,8 +1,9 @@
 use std::{collections::BTreeMap, vec::Vec};
 
-use crate::collection::processes::{Pid, ProcessHarvest};
 use hashbrown::HashMap;
 
+use crate::collection::processes::{Pid, ProcessHarvest};
+
 #[derive(Clone, Debug, Default)]
 pub struct ProcessData {
     /// A PID to process data map.

src/app/data/store.rs

@@ -3,18 +3,17 @@ use std::{
     vec::Vec,
 };
 
+use super::{ProcessData, TimeSeriesData};
 #[cfg(feature = "battery")]
 use crate::collection::batteries;
 use crate::{
     app::AppConfigFields,
-    collection::{cpu, disks, memory::MemData, network, Data},
+    collection::{Data, cpu, disks, memory::MemData, network},
     dec_bytes_per_second_string,
     utils::data_units::DataUnit,
     widgets::{DiskWidgetData, TempWidgetData},
 };
 
-use super::{ProcessData, TimeSeriesData};
-
 /// A collection of data. This is where we dump data into.
 ///
 /// TODO: Maybe reduce visibility of internal data, make it only accessible through DataStore?
@@ -186,7 +185,7 @@ impl StoredData {
                     {
                         if !device.name.starts_with('/') {
                             Some(device.name.as_str()) // use the whole zfs
-                                                       // dataset name
+                        // dataset name
                         } else {
                             device.name.split('/').last()
                         }

src/app/layout_manager.rs

@@ -663,21 +663,20 @@ impl BottomLayout {
         BottomLayout {
             total_row_height_ratio: 3,
             rows: vec![
-                BottomRow::new(vec![BottomCol::new(vec![
-                    BottomColRow::new(vec![cpu]).canvas_handled()
+                BottomRow::new(vec![
+                    BottomCol::new(vec![BottomColRow::new(vec![cpu]).canvas_handled()])
+                        .canvas_handled(),
                 ])
-                .canvas_handled()])
                 .canvas_handled(),
-                BottomRow::new(vec![BottomCol::new(vec![BottomColRow::new(vec![
-                    mem, net,
+                BottomRow::new(vec![
+                    BottomCol::new(vec![BottomColRow::new(vec![mem, net]).canvas_handled()])
+                        .canvas_handled(),
                 ])
-                .canvas_handled()])
-                .canvas_handled()])
                 .canvas_handled(),
-                BottomRow::new(vec![BottomCol::new(vec![
-                    BottomColRow::new(vec![table]).canvas_handled()
+                BottomRow::new(vec![
+                    BottomCol::new(vec![BottomColRow::new(vec![table]).canvas_handled()])
+                        .canvas_handled(),
                 ])
-                .canvas_handled()])
                 .canvas_handled(),
                 BottomRow::new(table_widgets).canvas_handled(),
             ],

src/app/process_killer.rs

@@ -6,7 +6,7 @@ use anyhow::bail;
 use windows::Win32::{
     Foundation::{CloseHandle, HANDLE},
     System::Threading::{
-        OpenProcess, TerminateProcess, PROCESS_QUERY_INFORMATION, PROCESS_TERMINATE,
+        OpenProcess, PROCESS_QUERY_INFORMATION, PROCESS_TERMINATE, TerminateProcess,
     },
 };
 
@@ -68,9 +68,11 @@ pub fn kill_process_given_pid(pid: Pid, signal: usize) -> anyhow::Result<()> {
         let err_code = std::io::Error::last_os_error().raw_os_error();
         let err = match err_code {
             Some(libc::ESRCH) => "the target process did not exist.",
-            Some(libc::EPERM) => "the calling process does not have the permissions to terminate the target process(es).",
+            Some(libc::EPERM) => {
+                "the calling process does not have the permissions to terminate the target process(es)."
+            }
             Some(libc::EINVAL) => "an invalid signal was specified.",
-            _ => "Unknown error occurred."
+            _ => "Unknown error occurred.",
         };
 
         if let Some(err_code) = err_code {

src/app/states.rs

@@ -9,8 +9,8 @@ use crate::{
     app::layout_manager::BottomWidgetType,
     constants,
     widgets::{
-        query::ProcessQuery, BatteryWidgetState, CpuWidgetState, DiskTableWidget, MemWidgetState,
-        NetWidgetState, ProcWidgetState, TempWidgetState,
+        BatteryWidgetState, CpuWidgetState, DiskTableWidget, MemWidgetState, NetWidgetState,
+        ProcWidgetState, TempWidgetState, query::ProcessQuery,
     },
 };
 

src/canvas.rs

@@ -5,17 +5,17 @@ mod widgets;
 
 use itertools::izip;
 use tui::{
+    Frame, Terminal,
     backend::Backend,
     layout::{Constraint, Direction, Layout, Rect},
     text::Span,
     widgets::Paragraph,
-    Frame, Terminal,
 };
 
 use crate::{
     app::{
-        layout_manager::{BottomColRow, BottomLayout, BottomWidgetType, IntermediaryConstraint},
         App,
+        layout_manager::{BottomColRow, BottomLayout, BottomWidgetType, IntermediaryConstraint},
     },
     constants::*,
     options::config::style::Styles,
@@ -362,11 +362,7 @@ impl Painter {
                                 && actual_cpu_data_len.saturating_sub(1) % 4 != 0,
                         );
 
-                    if c <= 1 {
-                        1
-                    } else {
-                        c
-                    }
+                    if c <= 1 { 1 } else { c }
                 };
 
                 let mut mem_rows = 1;

src/canvas/components/data_table/draw.rs

@@ -5,10 +5,10 @@ use std::{
 
 use concat_string::concat_string;
 use tui::{
+    Frame,
     layout::{Constraint, Direction, Layout, Rect},
     text::{Line, Span, Text},
     widgets::{Block, Row, Table},
-    Frame,
 };
 
 use super::{
@@ -17,7 +17,7 @@ use super::{
 };
 use crate::{
     app::layout_manager::BottomWidget,
-    canvas::{drawing_utils::widget_block, Painter},
+    canvas::{Painter, drawing_utils::widget_block},
     constants::TABLE_GAP_HEIGHT_LIMIT,
     utils::strings::truncate_to_text,
 };

src/canvas/components/time_graph.rs

@@ -1,16 +1,15 @@
 mod time_chart;
-pub use time_chart::*;
-
 use std::{borrow::Cow, time::Instant};
 
 use concat_string::concat_string;
+pub use time_chart::*;
 use tui::{
+    Frame,
     layout::{Constraint, Rect},
     style::Style,
     symbols::Marker,
     text::{Line, Span},
     widgets::{BorderType, GraphType},
-    Frame,
 };
 
 use crate::{app::data::Values, canvas::drawing_utils::widget_block};

src/canvas/components/time_graph/time_chart.rs

@@ -16,13 +16,13 @@ use tui::{
     style::{Color, Style, Styled},
     symbols::{self, Marker},
     text::{Line, Span},
-    widgets::{block::BlockExt, Block, Borders, GraphType, Widget},
+    widgets::{Block, Borders, GraphType, Widget, block::BlockExt},
 };
 use unicode_width::UnicodeWidthStr;
 
 use crate::{
     app::data::Values,
-    utils::general::{saturating_log10, saturating_log2},
+    utils::general::{saturating_log2, saturating_log10},
 };
 
 pub const DEFAULT_LEGEND_CONSTRAINTS: (Constraint, Constraint) =
@@ -1116,7 +1116,7 @@ mod tests {
 
         assert!(layout.legend_area.is_some());
         assert_eq!(layout.legend_area.unwrap().height, 4); // 2 for borders, 2
-                                                           // for rows
+        // for rows
     }
 
     #[test]

src/canvas/components/time_graph/time_chart/canvas.rs

@@ -22,8 +22,8 @@ use tui::{
     symbols,
     text::Line,
     widgets::{
-        canvas::{Line as CanvasLine, Points},
         Block, Widget,
+        canvas::{Line as CanvasLine, Points},
     },
 };
 

src/canvas/components/time_graph/time_chart/points.rs

@@ -2,8 +2,8 @@ use itertools::Itertools;
 use tui::{
     style::Color,
     widgets::{
-        canvas::{Line as CanvasLine, Points},
         GraphType,
+        canvas::{Line as CanvasLine, Points},
     },
 };
 

src/canvas/components/widget_carousel.rs

@@ -1,12 +1,12 @@
 use tui::{
+    Frame,
     layout::{Alignment, Constraint, Direction, Layout, Rect},
     text::{Line, Span},
     widgets::{Block, Paragraph},
-    Frame,
 };
 
 use crate::{
-    app::{layout_manager::BottomWidgetType, App},
+    app::{App, layout_manager::BottomWidgetType},
     canvas::Painter,
 };
 

src/canvas/dialogs/dd_dialog.rs

@@ -2,15 +2,15 @@
 use std::cmp::min;
 
 use tui::{
+    Frame,
     layout::{Alignment, Constraint, Direction, Layout, Rect},
     text::{Line, Span, Text},
     widgets::{Block, Paragraph, Wrap},
-    Frame,
 };
 
 use crate::{
     app::{App, KillSignal, MAX_PROCESS_SIGNAL},
-    canvas::{drawing_utils::dialog_block, Painter},
+    canvas::{Painter, drawing_utils::dialog_block},
     widgets::ProcWidgetMode,
 };
 

src/canvas/dialogs/help_dialog.rs

@@ -1,16 +1,16 @@
 use std::cmp::{max, min};
 
 use tui::{
+    Frame,
     layout::{Alignment, Rect},
     text::{Line, Span},
     widgets::{Paragraph, Wrap},
-    Frame,
 };
 use unicode_width::UnicodeWidthStr;
 
 use crate::{
     app::App,
-    canvas::{drawing_utils::dialog_block, Painter},
+    canvas::{Painter, drawing_utils::dialog_block},
     constants::{self, HELP_TEXT},
 };
 

src/canvas/widgets/battery_display.rs

@@ -1,16 +1,16 @@
 use std::cmp::min;
 
 use tui::{
+    Frame,
     layout::{Constraint, Direction, Layout, Rect},
     text::{Line, Span},
     widgets::{Cell, Paragraph, Row, Table, Tabs},
-    Frame,
 };
 use unicode_width::UnicodeWidthStr;
 
 use crate::{
     app::App,
-    canvas::{drawing_utils::widget_block, Painter},
+    canvas::{Painter, drawing_utils::widget_block},
     collection::batteries::BatteryState,
     constants::*,
 };

src/canvas/widgets/cpu_basic.rs

@@ -2,16 +2,16 @@ use std::cmp::min;
 
 use itertools::{Either, Itertools};
 use tui::{
-    layout::{Constraint, Direction, Layout, Rect},
     Frame,
+    layout::{Constraint, Direction, Layout, Rect},
 };
 
 use crate::{
     app::App,
     canvas::{
+        Painter,
         components::pipe_gauge::{LabelLimit, PipeGauge},
         drawing_utils::widget_block,
-        Painter,
     },
     collection::cpu::{CpuData, CpuDataType},
 };

src/canvas/widgets/cpu_graph.rs

@@ -1,20 +1,20 @@
 use std::borrow::Cow;
 
 use tui::{
+    Frame,
     layout::{Constraint, Direction, Layout, Rect},
     symbols::Marker,
-    Frame,
 };
 
 use crate::{
-    app::{data::StoredData, layout_manager::WidgetDirection, App},
+    app::{App, data::StoredData, layout_manager::WidgetDirection},
     canvas::{
+        Painter,
         components::{
             data_table::{DrawInfo, SelectionState},
             time_graph::{AxisBound, GraphData, TimeGraph},
         },
         drawing_utils::should_hide_x_label,
-        Painter,
     },
     collection::cpu::CpuData,
     widgets::CpuWidgetState,
@@ -158,10 +158,12 @@ impl Painter {
                     [(offset_position - show_avg_offset) % self.styles.cpu_colour_styles.len()]
             };
 
-            vec![GraphData::default()
-                .style(style)
-                .time(time)
-                .values(&cpu_points[current_scroll_position - 1])]
+            vec![
+                GraphData::default()
+                    .style(style)
+                    .time(time)
+                    .values(&cpu_points[current_scroll_position - 1]),
+            ]
         } else {
             vec![]
         }

src/canvas/widgets/disk_table.rs

@@ -1,10 +1,10 @@
-use tui::{layout::Rect, Frame};
+use tui::{Frame, layout::Rect};
 
 use crate::{
     app,
     canvas::{
-        components::data_table::{DrawInfo, SelectionState},
         Painter,
+        components::data_table::{DrawInfo, SelectionState},
     },
 };