Merge #1313

1313: Update to cfg-if 1.0 r=asomers a=mbrubeck



Co-authored-by: Matt Brubeck <mbrubeck@limpet.net>

Author: bors[bot]

Cargo.toml

@@ -19,7 +19,7 @@ exclude     = [
 [dependencies]
 libc = { version = "0.2.78", features = [ "extra_traits" ] }
 bitflags = "1.1"
-cfg-if = "0.1.10"
+cfg-if = "1.0"
 
 [target.'cfg(target_os = "dragonfly")'.build-dependencies]
 cc = "1"

test/test_unistd.rs

@@ -377,7 +377,7 @@ cfg_if!{
                              "./sh", AtFlags::empty());
         execve_test_factory!(test_execveat_absolute, execveat, File::open("/").unwrap().into_raw_fd(),
                              "/system/bin/sh", AtFlags::empty());
-    } else if #[cfg(all(target_os = "linux"), any(target_arch ="x86_64", target_arch ="x86"))] {
+    } else if #[cfg(all(target_os = "linux", any(target_arch ="x86_64", target_arch ="x86")))] {
         use nix::fcntl::AtFlags;
         execve_test_factory!(test_execveat_empty, execveat, File::open("/bin/sh").unwrap().into_raw_fd(),
                              "", AtFlags::AT_EMPTY_PATH);