clippy fixes

src/column.rs

@@ -125,7 +125,7 @@ macro_rules! column_default_sorted_pid {
         fn sorted_pid(&self, order: &$crate::config::ConfigSortOrder) -> Vec<i32> {
             let mut contents: Vec<(&i32, &$x)> = self.raw_contents.iter().collect();
             contents.sort_by_key(|&(_x, y)| y);
-            if let $crate::config::ConfigSortOrder::Descending = order {
+            if matches!(*order, $crate::config::ConfigSortOrder::Descending) {
                 contents.reverse()
             }
             contents.iter().map(|(x, _y)| **x).collect()

src/columns/ccgroup.rs

@@ -23,7 +23,7 @@ impl Ccgroup {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("Cgroup (compressed)"));
         let unit = String::new();
-        Ccgroup {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/cgroup.rs

@@ -15,7 +15,7 @@ impl Cgroup {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("Cgroup"));
         let unit = String::new();
-        Cgroup {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/command.rs

@@ -15,7 +15,7 @@ impl Command {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("Command"));
         let unit = String::new();
-        Command {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/context_sw.rs

@@ -16,7 +16,7 @@ impl ContextSw {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("ContextSw"));
         let unit = String::new();
-        ContextSw {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/cpu_time.rs

@@ -15,7 +15,7 @@ impl CpuTime {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("CPU Time"));
         let unit = String::new();
-        CpuTime {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/docker.rs

@@ -41,7 +41,7 @@ impl Docker {
         } else {
             available = false;
         }
-        Docker {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/eip.rs

@@ -15,7 +15,7 @@ impl Eip {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("EIP"));
         let unit = String::new();
-        Eip {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/elapsed_time.rs

@@ -27,7 +27,7 @@ impl ElapsedTime {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("Elapsed"));
         let unit = String::new();
-        ElapsedTime {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/empty.rs

@@ -15,7 +15,7 @@ impl Empty {
     pub fn new() -> Self {
         let header = String::new();
         let unit = String::new();
-        Empty {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/env.rs

@@ -15,7 +15,7 @@ impl Env {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("Env"));
         let unit = String::new();
-        Env {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/esp.rs

@@ -15,7 +15,7 @@ impl Esp {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("ESP"));
         let unit = String::new();
-        Esp {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/file_name.rs

@@ -15,7 +15,7 @@ impl FileName {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("FileName"));
         let unit = String::new();
-        FileName {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/gid.rs

@@ -19,7 +19,7 @@ impl Gid {
     pub fn new(header: Option<String>, abbr_sid: bool) -> Self {
         let header = header.unwrap_or_else(|| String::from("GID"));
         let unit = String::new();
-        Gid {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,
@@ -65,7 +65,7 @@ impl Column for Gid {
 impl Column for Gid {
     fn add(&mut self, proc: &ProcessInfo) {
         let mut sid = &proc.groups[0].sid;
-        let mut kind = std::u64::MAX;
+        let mut kind = u64::MAX;
         for g in &proc.groups {
             if g.sid.len() > 3 && g.sid[1] == 5 && g.sid[2] == 32 && kind > g.sid[3] {
                 sid = &g.sid;

src/columns/gid_fs.rs

@@ -15,7 +15,7 @@ impl GidFs {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("FGID"));
         let unit = String::new();
-        GidFs {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/gid_real.rs

@@ -15,7 +15,7 @@ impl GidReal {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("RGID"));
         let unit = String::new();
-        GidReal {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/gid_saved.rs

@@ -15,7 +15,7 @@ impl GidSaved {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("SGID"));
         let unit = String::new();
-        GidSaved {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/group.rs

@@ -23,7 +23,7 @@ impl Group {
     pub fn new(header: Option<String>, abbr_sid: bool) -> Self {
         let header = header.unwrap_or_else(|| String::from("Group"));
         let unit = String::new();
-        Group {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,
@@ -79,7 +79,7 @@ impl Column for Group {
 impl Column for Group {
     fn add(&mut self, proc: &ProcessInfo) {
         let mut sid_name = &proc.groups[0];
-        let mut kind = std::u64::MAX;
+        let mut kind = u64::MAX;
         for g in &proc.groups {
             if g.sid.len() > 3 && g.sid[1] == 5 && g.sid[2] == 32 && kind > g.sid[3] {
                 sid_name = g;

src/columns/group_fs.rs

@@ -17,7 +17,7 @@ impl GroupFs {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("File System Group"));
         let unit = String::new();
-        GroupFs {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/group_real.rs

@@ -17,7 +17,7 @@ impl GroupReal {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("Real Group"));
         let unit = String::new();
-        GroupReal {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/group_saved.rs

@@ -17,7 +17,7 @@ impl GroupSaved {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("Saved Group"));
         let unit = String::new();
-        GroupSaved {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/maj_flt.rs

@@ -15,7 +15,7 @@ impl MajFlt {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("MajorFaults"));
         let unit = String::new();
-        MajFlt {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,
@@ -42,7 +42,7 @@ impl Column for MajFlt {
 impl Column for MajFlt {
     fn add(&mut self, proc: &ProcessInfo) {
         let raw_content = proc.curr_task.ptinfo.pti_pageins as u64;
-        let fmt_content = format!("{}", raw_content);
+        let fmt_content = format!("{raw_content}");
 
         self.fmt_contents.insert(proc.pid, fmt_content);
         self.raw_contents.insert(proc.pid, raw_content);
@@ -55,7 +55,7 @@ impl Column for MajFlt {
 impl Column for MajFlt {
     fn add(&mut self, proc: &ProcessInfo) {
         let raw_content = proc.memory_info.page_fault_count;
-        let fmt_content = format!("{}", raw_content);
+        let fmt_content = format!("{raw_content}");
 
         self.fmt_contents.insert(proc.pid, fmt_content);
         self.raw_contents.insert(proc.pid, raw_content);

src/columns/min_flt.rs

@@ -15,7 +15,7 @@ impl MinFlt {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("MinorFaults"));
         let unit = String::new();
-        MinFlt {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/multi_slot.rs

@@ -15,7 +15,7 @@ impl MultiSlot {
     pub fn new() -> Self {
         let header = String::new();
         let unit = String::new();
-        MultiSlot {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/nice.rs

@@ -15,7 +15,7 @@ impl Nice {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("Nice"));
         let unit = String::new();
-        Nice {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/pgid.rs

@@ -15,7 +15,7 @@ impl Pgid {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("PGID"));
         let unit = String::new();
-        Pgid {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/pid.rs

@@ -15,7 +15,7 @@ impl Pid {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("PID"));
         let unit = String::new();
-        Pid {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,
@@ -45,7 +45,7 @@ impl Column for Pid {
 impl Column for Pid {
     fn add(&mut self, proc: &ProcessInfo) {
         let raw_content = proc.pid;
-        let fmt_content = format!("{}", raw_content);
+        let fmt_content = format!("{raw_content}");
 
         self.fmt_contents.insert(proc.pid, fmt_content);
         self.raw_contents.insert(proc.pid, raw_content);

src/columns/policy.rs

@@ -15,7 +15,7 @@ impl Policy {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("Policy"));
         let unit = String::new();
-        Policy {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/ppid.rs

@@ -15,7 +15,7 @@ impl Ppid {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("Parent PID"));
         let unit = String::new();
-        Ppid {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/priority.rs

@@ -15,7 +15,7 @@ impl Priority {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("Priority"));
         let unit = String::new();
-        Priority {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/processor.rs

@@ -15,7 +15,7 @@ impl Processor {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("Processor"));
         let unit = String::new();
-        Processor {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/read_bytes.rs

@@ -16,7 +16,7 @@ impl ReadBytes {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("Read"));
         let unit = String::from("[B/s]");
-        ReadBytes {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/rt_priority.rs

@@ -15,7 +15,7 @@ impl RtPriority {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("RT Priority"));
         let unit = String::new();
-        RtPriority {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/sec_context.rs

@@ -17,7 +17,7 @@ impl SecContext {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("Context"));
         let unit = String::new();
-        SecContext {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/separator.rs

@@ -16,7 +16,7 @@ impl Separator {
     pub fn new(separator: &str) -> Self {
         let header = String::from(separator);
         let unit = String::from(separator);
-        Separator {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/session.rs

@@ -17,7 +17,7 @@ impl Session {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("Session"));
         let unit = String::new();
-        Session {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/shd_pnd.rs

@@ -15,7 +15,7 @@ impl ShdPnd {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("ShdPnd"));
         let unit = String::new();
-        ShdPnd {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/sig_blk.rs

@@ -15,7 +15,7 @@ impl SigBlk {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("SigBlk"));
         let unit = String::new();
-        SigBlk {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,

src/columns/sig_cgt.rs

@@ -15,7 +15,7 @@ impl SigCgt {
     pub fn new(header: Option<String>) -> Self {
         let header = header.unwrap_or_else(|| String::from("SigCgt"));
         let unit = String::new();
-        SigCgt {
+        Self {
             fmt_contents: HashMap::new(),
             raw_contents: HashMap::new(),
             width: 0,