From 4adea5c566dfce51d55acd12a995f5c8d86c1fb4 Mon Sep 17 00:00:00 2001
From: daladim <daladim@users.noreply.github.com>
Date: Fri, 25 Jun 2021 11:17:17 +0200
Subject: [PATCH] [minor] Clippy

---
 heim-cpu/src/sys/linux/freq.rs      | 4 ++--
 heim-disk/src/sys/linux/counters.rs | 6 +++---
 heim-memory/src/sys/macos/memory.rs | 2 +-
 heim-memory/src/sys/macos/swap.rs   | 2 +-
 heim-process/src/sys/unix/env.rs    | 5 +----
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/heim-cpu/src/sys/linux/freq.rs b/heim-cpu/src/sys/linux/freq.rs
index 9242dee3..7a9ed565 100644
--- a/heim-cpu/src/sys/linux/freq.rs
+++ b/heim-cpu/src/sys/linux/freq.rs
@@ -46,7 +46,7 @@ impl ops::Add<CpuFrequency> for CpuFrequency {
             (None, None) => None,
         };
 
-        CpuFrequency { current, max, min }
+        CpuFrequency { current, min, max }
     }
 }
 
@@ -69,7 +69,7 @@ fn _frequencies() -> impl Iterator<Item = Result<CpuFrequency>> {
         let max = max_freq(&path);
         let min = min_freq(&path);
 
-        Ok(CpuFrequency { current, max, min })
+        Ok(CpuFrequency { current, min, max })
     })
 }
 
diff --git a/heim-disk/src/sys/linux/counters.rs b/heim-disk/src/sys/linux/counters.rs
index 42c66bea..1277e9a9 100644
--- a/heim-disk/src/sys/linux/counters.rs
+++ b/heim-disk/src/sys/linux/counters.rs
@@ -104,12 +104,12 @@ impl FromStr for IoCounters {
         Ok(IoCounters {
             name,
             read_count,
-            read_merged_count,
-            read_bytes,
             write_count,
-            write_merged_count,
+            read_bytes,
             write_bytes,
             busy_time,
+            read_merged_count,
+            write_merged_count,
         })
     }
 }
diff --git a/heim-memory/src/sys/macos/memory.rs b/heim-memory/src/sys/macos/memory.rs
index 0c4a1bf4..d5964ad7 100644
--- a/heim-memory/src/sys/macos/memory.rs
+++ b/heim-memory/src/sys/macos/memory.rs
@@ -68,8 +68,8 @@ pub async fn memory() -> Result<Memory> {
     Ok(Memory {
         total,
         available,
-        free,
         used,
+        free,
         active,
         inactive,
         wire,
diff --git a/heim-memory/src/sys/macos/swap.rs b/heim-memory/src/sys/macos/swap.rs
index 1e8ec2a1..f95c4b44 100644
--- a/heim-memory/src/sys/macos/swap.rs
+++ b/heim-memory/src/sys/macos/swap.rs
@@ -48,8 +48,8 @@ pub async fn swap() -> Result<Swap> {
 
     Ok(Swap {
         total,
-        free,
         used,
+        free,
         sin,
         sout,
     })
diff --git a/heim-process/src/sys/unix/env.rs b/heim-process/src/sys/unix/env.rs
index b2464009..454a9ddd 100644
--- a/heim-process/src/sys/unix/env.rs
+++ b/heim-process/src/sys/unix/env.rs
@@ -93,10 +93,7 @@ impl<'e> Iterator for EnvironmentIter<'e> {
     type Item = (&'e OsStr, &'e OsStr);
 
     fn next(&mut self) -> Option<Self::Item> {
-        match self.0.next() {
-            Some((k, v)) => Some((k.as_os_str(), v.as_os_str())),
-            None => None,
-        }
+        self.0.next().map(|(k, v)| (k.as_os_str(), v.as_os_str()))
     }
 
     fn size_hint(&self) -> (usize, Option<usize>) {