c2rust-{build-paths,instrument}: Fix #708 by using #[cfg(unix)] i…

…nstead of `if cfg!(unix)`.
immunant · Nov 3, 2023 · d7de704 · d7de704
1 parent 3ecaab8
commit d7de704
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/c2rust-build-paths/src/lib.rs b/c2rust-build-paths/src/lib.rs
@@ -31,11 +31,14 @@ impl SysRoot {
             .split(|c| c.is_ascii_whitespace())
             .next()
             .unwrap_or_default();
-        let path = if cfg!(unix) {
+        #[cfg(unix)]
+        let path = {
             use std::os::unix::ffi::OsStrExt;
 
             OsStr::from_bytes(path)
-        } else {
+        };
+        #[cfg(not(unix))]
+        let path = {
             // Windows is hard, so just require UTF-8
             let path = str::from_utf8(path).expect("`rustc --print sysroot` is not UTF-8");
             OsStr::new(path)

diff --git a/dynamic_instrumentation/src/main.rs b/dynamic_instrumentation/src/main.rs
@@ -127,11 +127,14 @@ fn resolve_sysroot() -> anyhow::Result<PathBuf> {
         .split(|c| c.is_ascii_whitespace())
         .next()
         .unwrap_or_default();
-    let path = if cfg!(unix) {
+    #[cfg(unix)]
+    let path = {
         use std::os::unix::ffi::OsStrExt;
 
         OsStr::from_bytes(path)
-    } else {
+    };
+    #[cfg(not(unix))]
+    let path = {
         // Windows is hard, so just require UTF-8
         let path = std::str::from_utf8(path).context("`rustc --print sysroot` is not UTF-8")?;
         OsStr::new(path)