diff options
| author | bors <bors@rust-lang.org> | 2021-04-22 05:01:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-22 05:01:30 +0000 |
| commit | 71965ab4d05b023cd29c914ef1262a72cac02e01 (patch) | |
| tree | bc5c5084c6c21d76871f0ab6e40825ebfeaeed51 /library/std/src/sys/unix/mod.rs | |
| parent | c757729701e3d065e3ad6a9bf9f15ab206633c51 (diff) | |
| parent | 268d29d75d4ba1839e1c288cb7bd594e8bb9662f (diff) | |
| download | rust-71965ab4d05b023cd29c914ef1262a72cac02e01.tar.gz rust-71965ab4d05b023cd29c914ef1262a72cac02e01.zip | |
Auto merge of #84411 - m-ou-se:rollup-9btsp2t, r=m-ou-se
Rollup of 12 pull requests
Successful merges:
- #84013 (Replace all `fmt.pad` with `debug_struct`)
- #84119 (Move `sys::vxworks` code to `sys::unix`)
- #84212 (Replace `Void` in `sys` with never type)
- #84251 (fix 'const-stable since' for NonZeroU*::new_unchecked)
- #84301 (Document that `index` and `index_mut` can panic)
- #84365 (Improve the docstrings of the `Lto` struct.)
- #84378 (Fix broken doc link)
- #84379 (Add GAT related tests)
- #84380 (Write Rustdoc titles like "x in crate::mod - Rust")
- #84390 (Format `Struct { .. }` on one line even with `{:#?}`.)
- #84393 (Support `x.py doc std --open`)
- #84406 (Remove `delete` alias from `mem::drop`.)
Failed merges:
- #84387 (Move `sys_common::poison` to `sync::poison`)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/unix/mod.rs')
| -rw-r--r-- | library/std/src/sys/unix/mod.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/library/std/src/sys/unix/mod.rs b/library/std/src/sys/unix/mod.rs index 6e44ac19c7b..1316835a89d 100644 --- a/library/std/src/sys/unix/mod.rs +++ b/library/std/src/sys/unix/mod.rs @@ -71,6 +71,7 @@ pub fn init() { } else if #[cfg(not(any( target_os = "emscripten", target_os = "fuchsia", + target_os = "vxworks", // The poll on Darwin doesn't set POLLNVAL for closed fds. target_os = "macos", target_os = "ios", |