diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-04-22 01:27:43 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-04-22 01:27:43 +0000 |
| commit | d8f3f74f4652692719585ce23c86b5f781970a89 (patch) | |
| tree | 1af1236b434b5b4afb2f35fea6906ed179dd2111 | |
| parent | 80e716e41e2ce991a9ffc3a726c246f00f7e449d (diff) | |
| parent | fac6b56603d52ab3884f667801c729e46639db1e (diff) | |
| download | nix-d8f3f74f4652692719585ce23c86b5f781970a89.zip | |
Merge #1046
1046: Remove duplicate use statements on macOS. r=asomers a=pusateri
nix current compiles on 1.34.0 stable but not on 1.36.0 nightly because of duplicate use statements. This trivial change removes the duplicates so it compiles and the tests run successfully on 1.36.0 nightly (33fe1131c 2019-04-20)
Co-authored-by: Tom Pusateri <pusateri@bangj.com>
| -rw-r--r-- | src/unistd.rs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/unistd.rs b/src/unistd.rs index f855c0af..96d8ace7 100644 --- a/src/unistd.rs +++ b/src/unistd.rs @@ -1069,7 +1069,6 @@ pub fn pipe2(flags: OFlag) -> Result<(RawFd, RawFd)> { #[cfg(any(target_os = "ios", target_os = "macos"))] fn pipe2_setflags(fd1: RawFd, fd2: RawFd, flags: OFlag) -> Result<()> { - use fcntl::FdFlag; use fcntl::FcntlArg::F_SETFL; let mut res = Ok(0); @@ -1119,8 +1118,6 @@ pub fn ftruncate(fd: RawFd, len: off_t) -> Result<()> { } pub fn isatty(fd: RawFd) -> Result<bool> { - use libc; - unsafe { // ENOTTY means `fd` is a valid file descriptor, but not a TTY, so // we return `Ok(false)` |