Skip to content

Commit 360db9c

Browse files
authored
Rollup merge of rust-lang#85409 - CDirkx:cfg_redox, r=nagisa
Simplify `cfg(any(unix, target_os="redox"))` in example to just `cfg(unix)` Update example for `OsString` that handled `redox` seperately from `unix`: Redox has been completely integrated under `target_family="unix"`, so `cfg(unix)` implies `target_os="redox"` https://github.com/rust-lang/rust/blob/35dbef235048f9a2939dc20effe083ca483c37ff/compiler/rustc_target/src/spec/redox_base.rs#L26
2 parents af1ac55 + 3836427 commit 360db9c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

library/std/src/ffi/os_str.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ impl OsStr {
601601
/// // sequences simply through collecting user command line arguments, for
602602
/// // example.
603603
///
604-
/// #[cfg(any(unix, target_os = "redox"))] {
604+
/// #[cfg(unix)] {
605605
/// use std::ffi::OsStr;
606606
/// use std::os::unix::ffi::OsStrExt;
607607
///

0 commit comments

Comments
 (0)