zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-07-01 10:41:03 +02:00
Code Activity

style(sys-info): fix clippy warnings & run fmt

Browse source
This commit is contained in:
Jake Stanger 2022-10-16 01:03:20 +01:00
parent 9e6dbbd131
commit e4e72d8008
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
1 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/modules/sysinfo.rs
View file

@ -51,45 +51,45 @@ impl Default for Interval {
} }
impl Interval { impl Interval {
fn memory(self) -> u64 { const fn memory(self) -> u64 {
match self { match self {
Interval::All(n) => n, Self::All(n) => n,
Interval::Individual(intervals) => intervals.memory, Self::Individual(intervals) => intervals.memory,
} }
} }
fn cpu(self) -> u64 { const fn cpu(self) -> u64 {
match self { match self {
Interval::All(n) => n, Self::All(n) => n,
Interval::Individual(intervals) => intervals.cpu, Self::Individual(intervals) => intervals.cpu,
} }
} }
fn temps(self) -> u64 { const fn temps(self) -> u64 {
match self { match self {
Interval::All(n) => n, Self::All(n) => n,
Interval::Individual(intervals) => intervals.temps, Self::Individual(intervals) => intervals.temps,
} }
} }
fn disks(self) -> u64 { const fn disks(self) -> u64 {
match self { match self {
Interval::All(n) => n, Self::All(n) => n,
Interval::Individual(intervals) => intervals.disks, Self::Individual(intervals) => intervals.disks,
} }
} }
fn networks(self) -> u64 { const fn networks(self) -> u64 {
match self { match self {
Interval::All(n) => n, Self::All(n) => n,
Interval::Individual(intervals) => intervals.networks, Self::Individual(intervals) => intervals.networks,
} }
} }
fn system(self) -> u64 { const fn system(self) -> u64 {
match self { match self {
Interval::All(n) => n, Self::All(n) => n,
Interval::Individual(intervals) => intervals.system, Self::Individual(intervals) => intervals.system,
} }
} }
} }
@ -198,7 +198,7 @@ impl Module<gtk::Box> for SysInfoModule {
// system refresh // system refresh
{ {
let tx = refresh_tx.clone(); let tx = refresh_tx;
spawn(async move { spawn(async move {
loop { loop {
tx.send(RefreshType::System) tx.send(RefreshType::System)
@ -219,9 +219,9 @@ impl Module<gtk::Box> for SysInfoModule {
RefreshType::Temps => refresh_temp_tokens(&mut format_info, &mut sys), RefreshType::Temps => refresh_temp_tokens(&mut format_info, &mut sys),
RefreshType::Disks => refresh_disk_tokens(&mut format_info, &mut sys), RefreshType::Disks => refresh_disk_tokens(&mut format_info, &mut sys),
RefreshType::Network => { RefreshType::Network => {
refresh_network_tokens(&mut format_info, &mut sys, interval.networks()) refresh_network_tokens(&mut format_info, &mut sys, interval.networks());
} }
RefreshType::System => refresh_system_tokens(&mut format_info, &mut sys), RefreshType::System => refresh_system_tokens(&mut format_info, &sys),
}; };
tx.send(ModuleUpdateEvent::Update(format_info.clone())) tx.send(ModuleUpdateEvent::Update(format_info.clone()))
@ -389,7 +389,11 @@ fn refresh_disk_tokens(format_info: &mut HashMap<String, String>, sys: &mut Syst
} }
} }
fn refresh_network_tokens(format_info: &mut HashMap<String, String>, sys: &mut System, interval: u64) { fn refresh_network_tokens(
format_info: &mut HashMap<String, String>,
sys: &mut System,
interval: u64,
) {
sys.refresh_networks(); sys.refresh_networks();
for (iface, network) in sys.networks() { for (iface, network) in sys.networks() {