Merge pull request #284 from stanislav-tkach/release-3.0.9

Release the 3.0.9 version

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [3.0.9] (2021-12-21)
+
+- NetBSD bitness detection has been fixed. (#283)
+
 ## [3.0.8] (2021-11-23)
 
 - NetBSD support has been added. (#279)
@@ -231,7 +235,8 @@ All notable changes to this project will be documented in this file.
 
 The first release containing only minor infrastructural changes and based on [os_type](https://github.com/schultyy/os_type).
 
-[Unreleased]: https://github.com/stanislav-tkach/os_info/compare/v3.0.8...HEAD
+[Unreleased]: https://github.com/stanislav-tkach/os_info/compare/v3.0.9...HEAD
+[3.0.9]: https://github.com/stanislav-tkach/os_info/compare/v3.0.8...v3.0.9
 [3.0.8]: https://github.com/stanislav-tkach/os_info/compare/v3.0.7...v3.0.8
 [3.0.7]: https://github.com/stanislav-tkach/os_info/compare/v3.0.6...v3.0.7
 [3.0.6]: https://github.com/stanislav-tkach/os_info/compare/v3.0.5...v3.0.6

cli/Cargo.toml

@@ -17,7 +17,7 @@ name = "os_info"
 path = "src/main.rs"
 
 [dependencies]
-os_info = { version = "3.0.8", default-features = false, path = "../os_info" }
+os_info = { version = "3.0.9", default-features = false, path = "../os_info" }
 log = "0.4.5"
 env_logger = "0.9.0"
 structopt = "0.3"

os_info/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "os_info"
-version = "3.0.8"
+version = "3.0.9"
 authors = ["Jan Schulte <[email protected]>", "Stanislav Tkach <[email protected]>"]
 description = "Detect the operating system type and version."
 documentation = "https://docs.rs/os_info"

os_info/src/bitness.rs

@@ -38,39 +38,39 @@ impl Display for Bitness {
     target_os = "freebsd",
     target_os = "linux",
     target_os = "macos",
-    target_os = "netbsd"
 ))]
 pub fn get() -> Bitness {
-    if cfg!(target_os = "netbsd") {
-        let bitness = match &Command::new("sysctl")
-            .arg("-n")
-            .arg("hw.machine_arch")
-            .output()
-        {
-            Ok(Output { stdout, .. }) if stdout == b"amd64\n" => Bitness::X64,
-            Ok(Output { stdout, .. }) if stdout == b"x86_64\n" => Bitness::X64,
-            Ok(Output { stdout, .. }) if stdout == b"i386\n" => Bitness::X32,
-            Ok(Output { stdout, .. }) if stdout == b"aarch64\n" => Bitness::X64,
-            Ok(Output { stdout, .. }) if stdout == b"earmv7hf\n" => Bitness::X32,
-            _ => Bitness::Unknown,
-        };
-        return bitness;
-    }
-
     match &Command::new("getconf").arg("LONG_BIT").output() {
         Ok(Output { stdout, .. }) if stdout == b"32\n" => Bitness::X32,
         Ok(Output { stdout, .. }) if stdout == b"64\n" => Bitness::X64,
         _ => Bitness::Unknown,
     }
 }
 
+#[cfg(target_os = "netbsd")]
+pub fn get() -> Bitness {
+    match &Command::new("sysctl")
+        .arg("-n")
+        .arg("hw.machine_arch")
+        .output()
+    {
+        Ok(Output { stdout, .. }) if stdout == b"amd64\n" => Bitness::X64,
+        Ok(Output { stdout, .. }) if stdout == b"x86_64\n" => Bitness::X64,
+        Ok(Output { stdout, .. }) if stdout == b"i386\n" => Bitness::X32,
+        Ok(Output { stdout, .. }) if stdout == b"aarch64\n" => Bitness::X64,
+        Ok(Output { stdout, .. }) if stdout == b"earmv7hf\n" => Bitness::X32,
+        _ => Bitness::Unknown,
+    }
+}
+
 #[cfg(all(
     test,
     any(
+        target_os = "dragonfly",
         target_os = "freebsd",
         target_os = "linux",
         target_os = "macos",
-        target_os = "netbsd"
+        target_os = "netbsd",
     )
 ))]
 mod tests {