From 3545a31881f38419e9f3c489ba95aba5d432b8b4 Mon Sep 17 00:00:00 2001 From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com> Date: Sun, 12 Apr 2026 16:39:30 -0400 Subject: [PATCH] refactor: run nightly format (#2033) Run `cargo +nightly fmt` using the nightly options (other than wrap comments). --- src/app/data/process.rs | 7 ++++--- src/collection.rs | 4 ++-- src/collection/amd.rs | 2 +- src/collection/nvidia.rs | 2 +- src/collection/processes/freebsd.rs | 6 ++++-- src/collection/processes/macos.rs | 3 +-- src/collection/processes/unix/process_ext.rs | 6 ++++-- src/options/config/temperature.rs | 3 +-- 8 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/app/data/process.rs b/src/app/data/process.rs index d0b1bd31..980ba200 100644 --- a/src/app/data/process.rs +++ b/src/app/data/process.rs @@ -1,8 +1,9 @@ use std::{collections::BTreeMap, vec::Vec}; -use crate::utils::int_hash::IntHashMap; - -use crate::collection::processes::{Pid, ProcessHarvest}; +use crate::{ + collection::processes::{Pid, ProcessHarvest}, + utils::int_hash::IntHashMap, +}; #[derive(Clone, Debug, Default)] pub struct ProcessData { diff --git a/src/collection.rs b/src/collection.rs index 0ccec031..ac69f4ba 100644 --- a/src/collection.rs +++ b/src/collection.rs @@ -25,8 +25,6 @@ pub mod temperature; use std::time::{Duration, Instant}; -#[cfg(any(target_os = "linux", feature = "gpu"))] -use crate::utils::int_hash::IntHashMap; #[cfg(any(not(target_os = "windows"), feature = "gpu"))] use processes::Pid; #[cfg(feature = "battery")] @@ -34,6 +32,8 @@ use starship_battery::{Battery, Manager}; use super::DataFilters; use crate::app::layout_manager::UsedWidgets; +#[cfg(any(target_os = "linux", feature = "gpu"))] +use crate::utils::int_hash::IntHashMap; // TODO: We can possibly reuse an internal buffer for this to reduce allocs. #[derive(Clone, Debug)] diff --git a/src/collection/amd.rs b/src/collection/amd.rs index 8f7abf42..03363535 100644 --- a/src/collection/amd.rs +++ b/src/collection/amd.rs @@ -8,13 +8,13 @@ use std::{ time::{Duration, Instant}, }; -use crate::utils::int_hash::IntHashMap; use rustc_hash::{FxHashMap as HashMap, FxHashSet as HashSet}; use super::linux::utils::is_device_awake; use crate::{ app::layout_manager::UsedWidgets, collection::{memory::MemData, processes::Pid}, + utils::int_hash::IntHashMap, }; // TODO: May be able to clean up some of these, Option for example is a bit redundant. diff --git a/src/collection/nvidia.rs b/src/collection/nvidia.rs index 00c44884..75f353a2 100644 --- a/src/collection/nvidia.rs +++ b/src/collection/nvidia.rs @@ -1,6 +1,5 @@ use std::{num::NonZeroU64, sync::OnceLock}; -use crate::utils::int_hash::IntHashMap; use nvml_wrapper::{ Nvml, enum_wrappers::device::TemperatureSensor, enums::device::UsedGpuMemory, error::NvmlError, }; @@ -8,6 +7,7 @@ use nvml_wrapper::{ use crate::{ app::{filter::Filter, layout_manager::UsedWidgets}, collection::{memory::MemData, processes::Pid, temperature::TempSensorData}, + utils::int_hash::IntHashMap, }; pub static NVML_DATA: OnceLock> = OnceLock::new(); diff --git a/src/collection/processes/freebsd.rs b/src/collection/processes/freebsd.rs index 7d4c942c..03fcede6 100644 --- a/src/collection/processes/freebsd.rs +++ b/src/collection/processes/freebsd.rs @@ -2,10 +2,12 @@ use std::{io, process::Command}; -use crate::utils::int_hash::IntHashMap; use serde::{Deserialize, Deserializer}; -use crate::collection::{Pid, deserialize_xo, processes::UnixProcessExt}; +use crate::{ + collection::{Pid, deserialize_xo, processes::UnixProcessExt}, + utils::int_hash::IntHashMap, +}; #[derive(Deserialize, Debug, Default)] #[serde(rename_all = "kebab-case")] diff --git a/src/collection/processes/macos.rs b/src/collection/processes/macos.rs index 30154b4f..9cacf104 100644 --- a/src/collection/processes/macos.rs +++ b/src/collection/processes/macos.rs @@ -4,11 +4,10 @@ pub mod sysctl_bindings; use std::{io, process::Command}; -use crate::utils::int_hash::IntHashMap; use itertools::Itertools; use super::UnixProcessExt; -use crate::collection::Pid; +use crate::{collection::Pid, utils::int_hash::IntHashMap}; pub(crate) struct MacOSProcessExt; diff --git a/src/collection/processes/unix/process_ext.rs b/src/collection/processes/unix/process_ext.rs index fa803347..05c341cd 100644 --- a/src/collection/processes/unix/process_ext.rs +++ b/src/collection/processes/unix/process_ext.rs @@ -2,7 +2,6 @@ use std::{io, time::Duration}; -use crate::utils::int_hash::IntHashMap; use cfg_if::cfg_if; use itertools::Itertools; use sysinfo::{ProcessStatus, System}; @@ -10,7 +9,10 @@ use sysinfo::{ProcessStatus, System}; use super::{ProcessHarvest, process_status_str}; #[cfg(target_os = "macos")] use crate::collection::processes::macos::sysctl_bindings; -use crate::collection::{Pid, error::CollectionResult, processes::UserTable}; +use crate::{ + collection::{Pid, error::CollectionResult, processes::UserTable}, + utils::int_hash::IntHashMap, +}; fn get_nice(pid: Pid) -> i32 { // SAFETY: getpriority takes no user pointers; pid is passed as a value diff --git a/src/options/config/temperature.rs b/src/options/config/temperature.rs index bf457fac..d424a17b 100644 --- a/src/options/config/temperature.rs +++ b/src/options/config/temperature.rs @@ -1,8 +1,7 @@ use serde::Deserialize; -use crate::widgets::TempWidgetColumn; - use super::IgnoreList; +use crate::widgets::TempWidgetColumn; /// Temperature configuration. #[derive(Clone, Debug, Default, Deserialize)]