Skip to content

Commit 68d4ff0

Browse files
authored
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
2 parents 376655e + 738f736 commit 68d4ff0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

library/std/src/os/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pub use crate::sys::wasi_ext as wasi;
2929
// If we're not documenting libstd then we just expose the main modules as we otherwise would.
3030

3131
#[cfg(not(doc))]
32-
#[cfg(any(target_os = "redox", unix, target_os = "vxworks", target_os = "hermit"))]
32+
#[cfg(any(unix, target_os = "hermit"))]
3333
#[stable(feature = "rust1", since = "1.0.0")]
3434
pub use crate::sys::ext as unix;
3535

0 commit comments

Comments
 (0)