remove some collapsible_if

src/uucore/src/lib/mods/locale.rs

@@ -283,11 +283,11 @@ fn create_english_bundle_from_embedded(
     }
 
     // Checksum algorithms need locale messages from checksum_common
-    if util_name.ends_with("sum") {
-        if let Some(uucore_content) = get_embedded_locale("checksum_common/en-US.ftl") {
-            let uucore_resource = parse_fluent_resource(uucore_content, &CHECKSUM_FLUENT)?;
-            bundle.add_resource_overriding(uucore_resource);
-        }
+    if util_name.ends_with("sum")
+        && let Some(uucore_content) = get_embedded_locale("checksum_common/en-US.ftl")
+    {
+        let uucore_resource = parse_fluent_resource(uucore_content, &CHECKSUM_FLUENT)?;
+        bundle.add_resource_overriding(uucore_resource);
     }
 
     // Then, try to load utility-specific strings

src/uucore/src/lib/mods/os.rs

@@ -10,31 +10,21 @@
 /// Test if the program is running under WSL version 1
 pub fn is_wsl_1() -> bool {
     #[cfg(target_os = "linux")]
-    {
-        if is_wsl_2() {
-            return false;
-        }
-        if let Ok(b) = std::fs::read("/proc/sys/kernel/osrelease") {
-            if let Ok(s) = std::str::from_utf8(&b) {
-                let a = s.to_ascii_lowercase();
-                return a.contains("microsoft") || a.contains("wsl");
-            }
-        }
-    }
+    return !is_wsl_2()
+        && std::fs::read_to_string("/proc/sys/kernel/osrelease").is_ok_and(|s| {
+            let a = s.to_ascii_lowercase();
+            a.contains("microsoft") || a.contains("wsl")
+        });
+    #[cfg(not(target_os = "linux"))]
     false
 }
 
 /// Test if the program is running under WSL version 2
 pub fn is_wsl_2() -> bool {
     #[cfg(target_os = "linux")]
-    {
-        if let Ok(b) = std::fs::read("/proc/sys/kernel/osrelease") {
-            if let Ok(s) = std::str::from_utf8(&b) {
-                let a = s.to_ascii_lowercase();
-                return a.contains("wsl2");
-            }
-        }
-    }
+    return std::fs::read_to_string("/proc/sys/kernel/osrelease")
+        .is_ok_and(|s| s.to_ascii_lowercase().contains("wsl2"));
+    #[cfg(not(target_os = "linux"))]
     false
 }