From 69a4b595738fdccb5f2ece0a17fb2528c885d37b Mon Sep 17 00:00:00 2001 From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com> Date: Thu, 10 Apr 2025 19:20:11 -0400 Subject: [PATCH] other: fix clippy warnings (#1712) --- src/app/data/store.rs | 6 +++--- src/collection/processes/linux/process.rs | 2 +- src/options/config/style/utils.rs | 8 +------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/app/data/store.rs b/src/app/data/store.rs index ca225db3..8bba227b 100644 --- a/src/app/data/store.rs +++ b/src/app/data/store.rs @@ -176,7 +176,7 @@ impl StoredData { { match &device.volume_name { Some(volume_name) => Some(volume_name.as_str()), - None => device.name.split('/').last(), + None => device.name.split('/').next_back(), } } #[cfg(not(target_os = "windows"))] @@ -187,12 +187,12 @@ impl StoredData { Some(device.name.as_str()) // use the whole zfs // dataset name } else { - device.name.split('/').last() + device.name.split('/').next_back() } } #[cfg(not(feature = "zfs"))] { - device.name.split('/').last() + device.name.split('/').next_back() } } }) else { diff --git a/src/collection/processes/linux/process.rs b/src/collection/processes/linux/process.rs index 642b2a8b..df87fd4f 100644 --- a/src/collection/processes/linux/process.rs +++ b/src/collection/processes/linux/process.rs @@ -237,7 +237,7 @@ impl Process { let pid = pid_path .as_path() .components() - .last() + .next_back() .and_then(|s| s.to_string_lossy().parse::().ok()) .or_else(|| { rustix::fs::readlinkat(rustix::fs::CWD, &pid_path, vec![]) diff --git a/src/options/config/style/utils.rs b/src/options/config/style/utils.rs index 8d146837..c87152c6 100644 --- a/src/options/config/style/utils.rs +++ b/src/options/config/style/utils.rs @@ -63,13 +63,7 @@ fn convert_rgb_to_color(rgb_str: &str) -> Result { let rgb = rgb_list .iter() - .filter_map(|val| { - if let Ok(res) = (*(*val)).to_string().trim().parse::() { - Some(res) - } else { - None - } - }) + .filter_map(|val| (*(*val)).to_string().trim().parse::().ok()) .collect::>(); if rgb.len() == 3 {