fingerprint_mod

Author: epompeii

lib/bencher_context/src/client/platform/target_os/linux.rs renamed to lib/bencher_context/src/client/platform/fingerprint/linux.rs

@@ -2,8 +2,6 @@ use std::fs;
 
 use uuid::Uuid;
 
-use crate::client::platform::OperatingSystem;
-
 const HEX_BASE: u32 = 16;
 
 impl crate::Fingerprint {
@@ -20,10 +18,3 @@ fn parse_machine_id(path: &str) -> Option<Uuid> {
         .and_then(|id| u128::from_str_radix(id.trim(), HEX_BASE).ok())
         .map(Uuid::from_u128)
 }
-
-impl OperatingSystem {
-    #[allow(clippy::unnecessary_wraps)]
-    pub fn current() -> Option<Self> {
-        Some(Self::Linux)
-    }
-}

lib/bencher_context/src/client/platform/target_os/macos.rs renamed to lib/bencher_context/src/client/platform/fingerprint/macos.rs

@@ -2,8 +2,6 @@ use std::process::Command;
 
 use uuid::Uuid;
 
-use crate::client::platform::OperatingSystem;
-
 impl crate::Fingerprint {
     pub fn current() -> Option<Self> {
         Command::new("ioreg")
@@ -26,10 +24,3 @@ impl crate::Fingerprint {
             .map(Self)
     }
 }
-
-impl OperatingSystem {
-    #[allow(clippy::unnecessary_wraps)]
-    pub fn current() -> Option<Self> {
-        Some(Self::MacOS)
-    }
-}

lib/bencher_context/src/client/platform/base36.rs renamed to lib/bencher_context/src/client/platform/fingerprint/mod.rs

@@ -1,7 +1,37 @@
+use std::fmt;
+
 use bencher_valid::BASE_36;
 use uuid::Uuid;
 
-pub fn encode_uuid(uuid: Uuid) -> String {
+#[cfg(target_os = "linux")]
+mod linux;
+#[cfg(target_os = "macos")]
+mod macos;
+#[cfg(target_os = "windows")]
+mod windows;
+
+#[derive(Debug, Clone, Copy)]
+pub struct Fingerprint(Uuid);
+
+impl fmt::Display for Fingerprint {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", encode_uuid(self.0))
+    }
+}
+
+#[cfg(all(
+    not(target_os = "linux"),
+    not(target_os = "macos"),
+    not(target_os = "windows")
+))]
+impl Fingerprint {
+    #[allow(clippy::unnecessary_wraps)]
+    pub fn current() -> Option<Self> {
+        None
+    }
+}
+
+fn encode_uuid(uuid: Uuid) -> String {
     const ENCODED_LEN: usize = 13;
 
     let base = BASE_36.len() as u64;

lib/bencher_context/src/client/platform/target_os/windows.rs renamed to lib/bencher_context/src/client/platform/fingerprint/windows.rs

@@ -7,8 +7,6 @@ use windows::{
     Win32::System::Registry::{RegGetValueW, HKEY_LOCAL_MACHINE, RRF_RT_ANY},
 };
 
-use crate::client::platform::OperatingSystem;
-
 impl crate::Fingerprint {
     pub fn current() -> Option<Self> {
         serial_number().or_else(digital_product_id).map(Self)
@@ -60,10 +58,3 @@ fn digital_product_id() -> Option<Uuid> {
         .fold(0u128, |acc, byte| (acc << 8) | u128::from(byte));
     Some(Uuid::from_u128(digital_product_id))
 }
-
-impl OperatingSystem {
-    #[allow(clippy::unnecessary_wraps)]
-    pub fn current() -> Option<Self> {
-        Some(Self::Windows)
-    }
-}

lib/bencher_context/src/client/platform/mod.rs

@@ -1,61 +1,5 @@
-use std::fmt;
+mod fingerprint;
+mod operating_system;
 
-use uuid::Uuid;
-
-mod base36;
-mod target_os;
-
-#[derive(Debug, Clone, Copy)]
-pub struct Fingerprint(Uuid);
-
-impl fmt::Display for Fingerprint {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", base36::encode_uuid(self.0))
-    }
-}
-
-#[cfg(all(
-    not(target_os = "linux"),
-    not(target_os = "macos"),
-    not(target_os = "windows")
-))]
-impl Fingerprint {
-    #[allow(clippy::unnecessary_wraps)]
-    pub fn current() -> Option<Self> {
-        None
-    }
-}
-
-#[allow(dead_code)]
-#[derive(Debug, Clone, Copy)]
-pub enum OperatingSystem {
-    Linux,
-    MacOS,
-    Windows,
-}
-
-impl fmt::Display for OperatingSystem {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                OperatingSystem::Linux => "Linux",
-                OperatingSystem::MacOS => "macOS",
-                OperatingSystem::Windows => "Windows",
-            }
-        )
-    }
-}
-
-#[cfg(all(
-    not(target_os = "linux"),
-    not(target_os = "macos"),
-    not(target_os = "windows")
-))]
-impl OperatingSystem {
-    #[allow(clippy::unnecessary_wraps)]
-    pub fn current() -> Option<Self> {
-        None
-    }
-}
+pub use fingerprint::Fingerprint;
+pub use operating_system::OperatingSystem;

lib/bencher_context/src/client/platform/operating_system.rs

@@ -0,0 +1,37 @@
+use std::fmt;
+
+#[allow(dead_code)]
+#[derive(Debug, Clone, Copy)]
+pub enum OperatingSystem {
+    Linux,
+    MacOS,
+    Windows,
+}
+
+impl fmt::Display for OperatingSystem {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{}",
+            match self {
+                OperatingSystem::Linux => "Linux",
+                OperatingSystem::MacOS => "macOS",
+                OperatingSystem::Windows => "Windows",
+            }
+        )
+    }
+}
+
+impl OperatingSystem {
+    pub fn current() -> Option<Self> {
+        if cfg!(target_os = "linux") {
+            Some(Self::Linux)
+        } else if cfg!(target_os = "macos") {
+            Some(Self::MacOS)
+        } else if cfg!(target_os = "windows") {
+            Some(Self::Windows)
+        } else {
+            None
+        }
+    }
+}