Skip to content

Commit 7e5b38b

Browse files
bpetitbpetit
committed
style: clippy + fmt
1 parent d1ec426 commit 7e5b38b

5 files changed

Lines changed: 95 additions & 79 deletions

File tree

‎src/exporters/mod.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ impl MetricGenerator {
257257
&& container_regex.is_match(name)
258258
{
259259
consumers.push((p_record.process.clone(), OrderedFloat(diff as f64)));
260-
consumers.sort_by(|x, y| y.1.cmp(&x.1));
260+
consumers.sort_by_key(|y| std::cmp::Reverse(y.1));
261261
}
262262
//if container_regex.is_match(process_exe.to_str().unwrap_or_default()) {
263263
// consumers.push((p_record.process.clone(), OrderedFloat(diff as f64)));
@@ -960,10 +960,10 @@ impl MetricGenerator {
960960
attributes.insert("cmdline".to_string(), utils::filter_cmdline(&cmdline_str));
961961

962962
#[cfg(target_os = "linux")]
963-
if self.qemu {
964-
if let Some(vmname) = utils::filter_qemu_cmdline(&cmdline_str) {
965-
attributes.insert("vmname".to_string(), vmname);
966-
}
963+
if self.qemu
964+
&& let Some(vmname) = utils::filter_qemu_cmdline(&cmdline_str)
965+
{
966+
attributes.insert("vmname".to_string(), vmname);
967967
}
968968
}
969969

‎src/exporters/qemu.rs‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -138,20 +138,18 @@ impl QemuExporter {
138138
for vecp in processes.iter() {
139139
if !vecp.is_empty()
140140
&& let Some(pr) = vecp.first()
141-
{
142-
if let Some(res) = pr
141+
&& let Some(res) = pr
143142
.process
144143
.cmdline
145144
.iter()
146145
.find(|x| x.contains("qemu-system"))
147-
{
148-
debug!("Found a process with {}", res);
149-
let mut tmp: Vec<ProcessRecord> = vec![];
150-
for p in vecp.iter() {
151-
tmp.push(p.clone());
152-
}
153-
qemu_processes.push(tmp);
146+
{
147+
debug!("Found a process with {}", res);
148+
let mut tmp: Vec<ProcessRecord> = vec![];
149+
for p in vecp.iter() {
150+
tmp.push(p.clone());
154151
}
152+
qemu_processes.push(tmp);
155153
}
156154
}
157155
qemu_processes

‎src/sensors/mod.rs‎

Lines changed: 52 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -499,20 +499,30 @@ impl Topology {
499499
{
500500
iowait = Some(last_iowait - prev_iowait);
501501
}
502-
if last.irq.is_some() && previous.irq.is_some() {
503-
irq = Some(last.irq.unwrap() - previous.irq.unwrap());
502+
if let Some(last_irq) = last.irq
503+
&& let Some(previous_irq) = previous.irq
504+
{
505+
irq = Some(last_irq - previous_irq);
504506
}
505-
if last.softirq.is_some() && previous.softirq.is_some() {
506-
softirq = Some(last.softirq.unwrap() - previous.softirq.unwrap());
507+
if let Some(last_softirq) = last.softirq
508+
&& let Some(previous_softirq) = previous.softirq
509+
{
510+
softirq = Some(last_softirq - previous_softirq);
507511
}
508-
if last.steal.is_some() && previous.steal.is_some() {
509-
steal = Some(last.steal.unwrap() - previous.steal.unwrap());
512+
if let Some(last_steal) = last.steal
513+
&& let Some(previous_steal) = previous.steal
514+
{
515+
steal = Some(last_steal - previous_steal);
510516
}
511-
if last.guest.is_some() && previous.guest.is_some() {
512-
guest = Some(last.guest.unwrap() - previous.guest.unwrap());
517+
if let Some(last_guest) = last.guest
518+
&& let Some(previous_guest) = previous.guest
519+
{
520+
guest = Some(last_guest - previous_guest);
513521
}
514-
if last.guest_nice.is_some() && previous.guest_nice.is_some() {
515-
guest_nice = Some(last.guest_nice.unwrap() - previous.guest_nice.unwrap());
522+
if let Some(last_guest_nice) = last.guest_nice
523+
&& let Some(previous_guest_nice) = previous.guest_nice
524+
{
525+
guest_nice = Some(last_guest_nice - previous_guest_nice);
516526
}
517527
return Some(CPUStat {
518528
user: last.user - previous.user,
@@ -568,10 +578,10 @@ impl Topology {
568578
pub fn read_nb_process_running_current(&self) -> Option<u32> {
569579
#[cfg(target_os = "linux")]
570580
{
571-
if let Ok(result) = KernelStats::new() {
572-
if let Some(procs_running) = result.procs_running {
573-
return Some(procs_running);
574-
}
581+
if let Ok(result) = KernelStats::new()
582+
&& let Some(procs_running) = result.procs_running
583+
{
584+
return Some(procs_running);
575585
}
576586
}
577587
None
@@ -580,10 +590,10 @@ impl Topology {
580590
pub fn read_nb_process_blocked_current(&self) -> Option<u32> {
581591
#[cfg(target_os = "linux")]
582592
{
583-
if let Ok(result) = KernelStats::new() {
584-
if let Some(procs_blocked) = result.procs_blocked {
585-
return Some(procs_blocked);
586-
}
593+
if let Ok(result) = KernelStats::new()
594+
&& let Some(procs_blocked) = result.procs_blocked
595+
{
596+
return Some(procs_blocked);
587597
}
588598
}
589599
None
@@ -1201,23 +1211,35 @@ impl CPUSocket {
12011211
let mut steal = None;
12021212
let mut guest = None;
12031213
let mut guest_nice = None;
1204-
if last.iowait.is_some() && previous.iowait.is_some() {
1205-
iowait = Some(last.iowait.unwrap() - previous.iowait.unwrap());
1214+
if let Some(last_iowait) = last.iowait
1215+
&& let Some(previous_iowait) = previous.iowait
1216+
{
1217+
iowait = Some(last_iowait - previous_iowait);
12061218
}
1207-
if last.irq.is_some() && previous.irq.is_some() {
1208-
irq = Some(last.irq.unwrap() - previous.irq.unwrap());
1219+
if let Some(last_irq) = last.irq
1220+
&& let Some(previous_irq) = previous.irq
1221+
{
1222+
irq = Some(last_irq - previous_irq);
12091223
}
1210-
if last.softirq.is_some() && previous.softirq.is_some() {
1211-
softirq = Some(last.softirq.unwrap() - previous.softirq.unwrap());
1224+
if let Some(last_softirq) = last.softirq
1225+
&& let Some(previous_softirq) = previous.softirq
1226+
{
1227+
softirq = Some(last_softirq - previous_softirq);
12121228
}
1213-
if last.steal.is_some() && previous.steal.is_some() {
1214-
steal = Some(last.steal.unwrap() - previous.steal.unwrap());
1229+
if let Some(last_steal) = last.steal
1230+
&& let Some(previous_steal) = previous.steal
1231+
{
1232+
steal = Some(last_steal - previous_steal);
12151233
}
1216-
if last.guest.is_some() && previous.guest.is_some() {
1217-
guest = Some(last.guest.unwrap() - previous.guest.unwrap());
1234+
if let Some(last_guest) = last.guest
1235+
&& let Some(previous_guest) = previous.guest
1236+
{
1237+
guest = Some(last_guest - previous_guest);
12181238
}
1219-
if last.guest_nice.is_some() && previous.guest_nice.is_some() {
1220-
guest_nice = Some(last.guest_nice.unwrap() - previous.guest_nice.unwrap());
1239+
if let Some(last_guest_nice) = last.guest_nice
1240+
&& let Some(previous_guest_nice) = previous.guest_nice
1241+
{
1242+
guest_nice = Some(last_guest_nice - previous_guest_nice);
12211243
}
12221244
return Some(CPUStat {
12231245
user: last.user - previous.user,

‎src/sensors/powercap_rapl.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ impl RecordReader for Topology {
9393
}
9494
}
9595
for d in &s.domains {
96-
if d.name == "dram" {
97-
if let Ok(dr) = d.read_record() {
98-
match dr.value.trim().parse::<i128>() {
99-
Ok(val) => {
100-
total += val;
101-
}
102-
Err(e) => {
103-
warn!("Couldn't convert {} to i128: {}", dr.value.trim(), e);
104-
}
96+
if d.name == "dram"
97+
&& let Ok(dr) = d.read_record()
98+
{
99+
match dr.value.trim().parse::<i128>() {
100+
Ok(val) => {
101+
total += val;
102+
}
103+
Err(e) => {
104+
warn!("Couldn't convert {} to i128: {}", dr.value.trim(), e);
105105
}
106106
}
107107
}

‎src/sensors/utils.rs‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use procfs;
44
use regex::Regex;
55
#[allow(unused_imports)]
66
use std::collections::HashMap;
7-
use std::io::{Error, ErrorKind};
7+
use std::io::Error;
88
use std::path::PathBuf;
99
use std::time::{Duration, SystemTime};
1010
use sysinfo::{
@@ -100,11 +100,10 @@ impl IProcess {
100100
let mut utime = 0;
101101
if let Ok(procfs_process) =
102102
procfs::process::Process::new(process.pid().to_string().parse::<i32>().unwrap())
103+
&& let Ok(stat) = procfs_process.stat()
103104
{
104-
if let Ok(stat) = procfs_process.stat() {
105-
stime += stat.stime;
106-
utime += stat.utime;
107-
}
105+
stime += stat.stime;
106+
utime += stat.utime;
108107
}
109108
IProcess {
110109
pid: process.pid(),
@@ -145,10 +144,7 @@ impl IProcess {
145144
if let Some(p) = proc_tracker.sysinfo.process(self.pid) {
146145
Ok(p.cmd().to_vec())
147146
} else {
148-
Err(Error::new(
149-
ErrorKind::Other,
150-
"Failed to get original process.",
151-
))
147+
Err(Error::other("Failed to get original process."))
152148
}
153149
}
154150

@@ -340,10 +336,10 @@ impl ProcessTracker {
340336
}
341337

342338
pub fn get_process_last_record(&self, pid: Pid) -> Option<&ProcessRecord> {
343-
if let Some(records) = self.find_records(pid) {
344-
if let Some(last) = records.first() {
345-
return Some(last);
346-
}
339+
if let Some(records) = self.find_records(pid)
340+
&& let Some(last) = records.first()
341+
{
342+
return Some(last);
347343
}
348344
None
349345
}
@@ -354,7 +350,7 @@ impl ProcessTracker {
354350
if records.len() > max_records_per_process as usize {
355351
let diff = records.len() - max_records_per_process as usize;
356352
for _ in 0..diff {
357-
records.sort_by(|a, b| b.timestamp.cmp(&a.timestamp));
353+
records.sort_by_key(|b| std::cmp::Reverse(b.timestamp));
358354
let res = records.pop().unwrap().timestamp;
359355
trace!(
360356
"Cleaning old ProcessRecords in vector for PID {}",
@@ -419,15 +415,15 @@ impl ProcessTracker {
419415
/// Extracts the container_id from a cgroup path containing it.
420416
#[cfg(feature = "containers")]
421417
fn extract_pod_id_from_cgroup_path(&self, pathname: String) -> Result<String, std::io::Error> {
422-
let mut container_id = String::from(pathname.split('/').last().unwrap());
418+
let mut container_id = String::from(pathname.split('/').next_back().unwrap());
423419
if container_id.starts_with("docker-") {
424420
container_id = container_id.strip_prefix("docker-").unwrap().to_string();
425421
}
426422
if container_id.ends_with(".scope") {
427423
container_id = container_id.strip_suffix(".scope").unwrap().to_string();
428424
}
429425
if container_id.contains("cri-containerd") {
430-
container_id = container_id.split(':').last().unwrap().to_string();
426+
container_id = container_id.split(':').next_back().unwrap().to_string();
431427
}
432428
if container_id.starts_with("cri-containerd-") {
433429
container_id = container_id
@@ -588,13 +584,13 @@ impl ProcessTracker {
588584
pod_namespace.clone(),
589585
);
590586
}
591-
if let Some(pod_spec) = &pod.spec {
592-
if let Some(node_name) = &pod_spec.node_name {
593-
description.insert(
594-
String::from("kubernetes_node_name"),
595-
node_name.clone(),
596-
);
597-
}
587+
if let Some(pod_spec) = &pod.spec
588+
&& let Some(node_name) = &pod_spec.node_name
589+
{
590+
description.insert(
591+
String::from("kubernetes_node_name"),
592+
node_name.clone(),
593+
);
598594
}
599595
}
600596
found = true;
@@ -696,7 +692,7 @@ impl ProcessTracker {
696692
if let Some(sysinfo_process) = self.sysinfo.process(pid as _) {
697693
let new_consumer = IProcess::new(sysinfo_process);
698694
consumers.push((new_consumer, OrderedFloat(diff as f64)));
699-
consumers.sort_by(|x, y| y.1.cmp(&x.1));
695+
consumers.sort_by_key(|y| std::cmp::Reverse(y.1));
700696
if consumers.len() > top as usize {
701697
consumers.pop();
702698
}
@@ -725,10 +721,10 @@ impl ProcessTracker {
725721
let process_cmdline = p_record.process.cmdline(self).unwrap_or_default();
726722
if regex_filter.is_match(process_exe.to_str().unwrap_or_default()) {
727723
consumers.push((p_record.process.clone(), OrderedFloat(diff as f64)));
728-
consumers.sort_by(|x, y| y.1.cmp(&x.1));
724+
consumers.sort_by_key(|y| std::cmp::Reverse(y.1));
729725
} else if regex_filter.is_match(&process_cmdline.concat()) {
730726
consumers.push((p_record.process.clone(), OrderedFloat(diff as f64)));
731-
consumers.sort_by(|x, y| y.1.cmp(&x.1));
727+
consumers.sort_by_key(|y| std::cmp::Reverse(y.1));
732728
}
733729
}
734730
}

0 commit comments

Comments
 (0)