diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-10-15 21:10:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-15 21:10:57 +0000 |
| commit | 07f8d12c6e8976989ac3fc96723893382483a820 (patch) | |
| tree | 27cfb9d0efa405a34a3d40b71b9d5fa144d5d43f | |
| parent | 477743d01254ba31a394770d4466960d47fa087f (diff) | |
| parent | 8a9c5346868e2c4cc4899bf906325b5aa0169528 (diff) | |
| download | nix-07f8d12c6e8976989ac3fc96723893382483a820.zip | |
Merge #1313
1313: Update to cfg-if 1.0 r=asomers a=mbrubeck
Co-authored-by: Matt Brubeck <mbrubeck@limpet.net>
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | test/test_unistd.rs | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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" diff --git a/test/test_unistd.rs b/test/test_unistd.rs index c7a75fbe..a4b8a916 100644 --- a/test/test_unistd.rs +++ b/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); |