diff --git a/Cargo.toml b/Cargo.toml index 984ab043..56962ae8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,9 +38,9 @@ exclude = [ "profile.json.gz", "rustfmt.toml", ] -edition = "2021" +edition = "2024" # The oldest version I've tested that should still build - note this is not an official MSRV! -rust-version = "1.81" +rust-version = "1.85" [lib] test = true diff --git a/src/canvas/components/time_graph/base.rs b/src/canvas/components/time_graph/base.rs index 4e372f6c..1d349881 100644 --- a/src/canvas/components/time_graph/base.rs +++ b/src/canvas/components/time_graph/base.rs @@ -196,13 +196,11 @@ fn create_dataset(data: GraphData<'_>) -> Dataset<'_> { .data(time, values) .graph_type(GraphType::Line); - let dataset = if let Some(name) = name { + if let Some(name) = name { dataset.name(name) } else { dataset - }; - - dataset + } } #[cfg(test)] diff --git a/src/canvas/widgets/network_graph.rs b/src/canvas/widgets/network_graph.rs index 7e6e3d46..87472c05 100644 --- a/src/canvas/widgets/network_graph.rs +++ b/src/canvas/widgets/network_graph.rs @@ -288,8 +288,7 @@ impl Painter { f.render_widget( Table::new( total_network, - &((std::iter::repeat(draw_loc.width.saturating_sub(2) / 4)) - .take(4) + &((std::iter::repeat_n(draw_loc.width.saturating_sub(2) / 4, 4)) .map(Constraint::Length) .collect::>()), ) diff --git a/src/options.rs b/src/options.rs index 5bd333be..f899caca 100644 --- a/src/options.rs +++ b/src/options.rs @@ -756,13 +756,11 @@ fn get_default_cpu_selection(args: &BottomArgs, config: &Config) -> config::cpu: } fn get_dedicated_avg_row(config: &Config) -> bool { - let conf = config + config .flags .as_ref() .and_then(|flags| flags.average_cpu_row) - .unwrap_or(false); - - conf + .unwrap_or(false) } #[inline]