Use result type instead of unwrapping value

JasonHonor · Apr 11, 2022 · d867959 · d867959
1 parent e4b685e
commit d867959
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/os_info/src/freebsd/mod.rs b/os_info/src/freebsd/mod.rs
@@ -29,19 +29,19 @@ fn get_os() -> Type {
         .output()
         .expect("Failed to get OS");
 
-    match str::from_utf8(&os.stdout).unwrap() {
-        "FreeBSD\n" => {
+    match str::from_utf8(&os.stdout).trim() {
+        Ok("FreeBSD") => {
             let check_hardening = Command::new("sysctl")
                 .arg("hardening.version")
                 .output()
                 .expect("Failed to check if is hardened");
-            match str::from_utf8(&check_hardening.stderr).unwrap() {
-                "" => return Type::HardenedBSD,
-                _ => return Type::FreeBSD,
+            match str::from_utf8(&check_hardening.stderr).trim() {
+                Ok("0") => return Type::HardenedBSD,
+                Err(_) => return Type::FreeBSD,
             }
         }
-        "MidnightBSD\n" => Type::MidnightBSD,
-        _ => Type::Unknown,
+        Ok("MidnightBSD") => Type::MidnightBSD,
+        Err(_) => Type::Unknown,
     }
 }