diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2021-03-03 16:27:47 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-03 16:27:47 +0900 |
| commit | 68d4ff04ee7d268cbad878d83b48c16e794019e3 (patch) | |
| tree | 173c29595eb8fe093c9cd30a8d3b7c5c705787a3 | |
| parent | 376655eaf6cb07660d816a99bc624fc1d1fa1bd8 (diff) | |
| parent | 738f7360664503e497d609cc8224f0602f31b07e (diff) | |
| download | rust-68d4ff04ee7d268cbad878d83b48c16e794019e3.tar.gz rust-68d4ff04ee7d268cbad878d83b48c16e794019e3.zip | |
Rollup merge of #82712 - CDirkx:cfg-target_os, r=dtolnay
Remove unnecessary conditional `cfg(target_os)` for `redox` and `vxworks` `redox` and `vxworks` are now part of target_family `unix`, thus `cfg(unix)` already implies `cfg(target_os="redox")` and `cfg(target_os="vxworks")` https://github.com/rust-lang/rust/blob/35dbef235048f9a2939dc20effe083ca483c37ff/compiler/rustc_target/src/spec/redox_base.rs#L26 https://github.com/rust-lang/rust/blob/35dbef235048f9a2939dc20effe083ca483c37ff/compiler/rustc_target/src/spec/vxworks_base.rs#L27
| -rw-r--r-- | library/std/src/os/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/os/mod.rs b/library/std/src/os/mod.rs index 31e39b5ad04..b95511e43d8 100644 --- a/library/std/src/os/mod.rs +++ b/library/std/src/os/mod.rs @@ -29,7 +29,7 @@ pub use crate::sys::wasi_ext as wasi; // If we're not documenting libstd then we just expose the main modules as we otherwise would. #[cfg(not(doc))] -#[cfg(any(target_os = "redox", unix, target_os = "vxworks", target_os = "hermit"))] +#[cfg(any(unix, target_os = "hermit"))] #[stable(feature = "rust1", since = "1.0.0")] pub use crate::sys::ext as unix; |