diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-06-09 03:52:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-09 03:52:06 +0000 |
| commit | 32d597bbd6177adcb611e8d8eea631bab71629f9 (patch) | |
| tree | ed28c4dcb3f6df041309df9e071fde1f5db8a752 /test | |
| parent | 649430f99004479597a134a94acfed6785068d9f (diff) | |
| parent | 80f8320ffd9caf64542916a63f986ba1f95e4613 (diff) | |
| download | nix-32d597bbd6177adcb611e8d8eea631bab71629f9.zip | |
Merge #1735
1735: Cleanup cfg blocks r=asomers a=rtzoeller
Remove obsolete references to target_env = wasi, target_os = nacl, target_os = osx, and a typo'd target_os = fushsia that didn't compile when fixed.
- target_env = wasi is dead: https://github.com/rust-lang/rust/pull/60117
- target_os = nacl is dead: https://github.com/rust-lang/rust/pull/45041
- target_os = osx is dead, but I can't find a link.
Found while exploring `--check-cfg`, as mentioned in #1734.
Co-authored-by: Ryan Zoeller <rtzoeller@rtzoeller.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/sys/test_sockopt.rs | 3 | ||||
| -rw-r--r-- | test/test_fcntl.rs | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/test/sys/test_sockopt.rs b/test/sys/test_sockopt.rs index 4f75e178..a17bc09f 100644 --- a/test/sys/test_sockopt.rs +++ b/test/sys/test_sockopt.rs @@ -170,8 +170,7 @@ fn test_so_tcp_keepalive() { #[cfg(any(target_os = "android", target_os = "dragonfly", target_os = "freebsd", - target_os = "linux", - target_os = "nacl"))] { + target_os = "linux"))] { let x = getsockopt(fd, sockopt::TcpKeepIdle).unwrap(); setsockopt(fd, sockopt::TcpKeepIdle, &(x + 1)).unwrap(); assert_eq!(getsockopt(fd, sockopt::TcpKeepIdle).unwrap(), x + 1); diff --git a/test/test_fcntl.rs b/test/test_fcntl.rs index ebfc43e2..5f2e53bd 100644 --- a/test/test_fcntl.rs +++ b/test/test_fcntl.rs @@ -462,7 +462,7 @@ mod linux_android { target_os = "android", target_os = "emscripten", target_os = "fuchsia", - any(target_os = "wasi", target_env = "wasi"), + target_os = "wasi", target_env = "uclibc", target_os = "freebsd"))] mod test_posix_fadvise { @@ -495,7 +495,7 @@ mod test_posix_fadvise { target_os = "dragonfly", target_os = "emscripten", target_os = "fuchsia", - any(target_os = "wasi", target_env = "wasi"), + target_os = "wasi", target_os = "freebsd"))] mod test_posix_fallocate { |