mirror of
https://github.com/ClementTsang/bottom.git
synced 2026-05-03 21:40:32 +00:00
refactor: run nightly format (#2033)
Run `cargo +nightly fmt` using the nightly options (other than wrap comments).
This commit is contained in:
@@ -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 {
|
||||
|
||||
+2
-2
@@ -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)]
|
||||
|
||||
@@ -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<Vec> for example is a bit redundant.
|
||||
|
||||
@@ -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<Result<Nvml, NvmlError>> = OnceLock::new();
|
||||
|
||||
@@ -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")]
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)]
|
||||
|
||||
Reference in New Issue
Block a user