Merge pull request #946 from mulkieran/cfg-if

Use cfg_if! macro where possible

Author: mulkieran

Cargo.toml

@@ -15,6 +15,7 @@ exclude = [".clippy.toml", ".githooks/*", ".gitignore", ".github/*", "Makefile"]
 
 [dependencies]
 bitflags = "2.3.3"
+cfg-if = "1.0.0"
 nix = {version = "0.29.0", features=["fs", "ioctl", "mount"]}
 env_logger="0.11.0"
 semver = "1.0.0"

src/core/device.rs

@@ -4,6 +4,7 @@
 
 use std::{fmt, path::Path, str::FromStr};
 
+use cfg_if::cfg_if;
 use nix::libc::{dev_t, major, makedev, minor};
 use nix::sys::stat::{self, SFlag};
 
@@ -71,20 +72,22 @@ impl From<dev_t> for Device {
 
 impl From<Device> for dev_t {
     fn from(dev: Device) -> dev_t {
-        #[cfg(target_os = "android")]
-        #[allow(clippy::useless_conversion)] // Param types u32 in libc 0.2.133
-        {
-            makedev(
-                dev.major
-                    .try_into()
-                    .expect("value is smaller than max positive i32"),
-                dev.minor
-                    .try_into()
-                    .expect("value is smaller than max positive i32"),
-            )
+        cfg_if! {
+            if #[cfg(target_os = "android")] {
+                // dev.major, dev.minor u32 in libc 0.2.133
+                #[allow(clippy::useless_conversion)]
+                makedev(
+                    dev.major
+                        .try_into()
+                        .expect("value is smaller than max positive i32"),
+                    dev.minor
+                        .try_into()
+                        .expect("value is smaller than max positive i32"),
+                )
+            } else {
+                makedev(dev.major, dev.minor)
+            }
         }
-        #[cfg(not(target_os = "android"))]
-        makedev(dev.major, dev.minor)
     }
 }
 

src/core/dm_udev_sync.rs

@@ -2,6 +2,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+use cfg_if::cfg_if;
+
 use crate::{core::dm_ioctl as dmi, result::DmResult};
 
 pub trait UdevSyncAction {
@@ -527,7 +529,10 @@ pub mod sync_noop {
     }
 }
 
-#[cfg(target_os = "android")]
-pub use self::sync_noop::UdevSync;
-#[cfg(not(target_os = "android"))]
-pub use self::sync_semaphore::UdevSync;
+cfg_if! {
+    if #[cfg(target_os = "android")] {
+        pub use self::sync_noop::UdevSync;
+    } else {
+        pub use self::sync_semaphore::UdevSync;
+    }
+}