bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #85409 - CDirkx:cfg_redox, r=nagisa

Browse source 
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"`

35dbef2350/compiler/rustc_target/src/spec/redox_base.rs (L26)
This commit is contained in:
Ralf Jung 2021-05-17 18:52:13 +02:00 • committed by GitHub
commit 360db9c384
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
library/std/src/ffi/os_str.rs
View file

@ -601,7 +601,7 @@ impl OsStr {
/// // sequences simply through collecting user command line arguments, for
/// // example.
///
/// #[cfg(any(unix, target_os = "redox"))] {
/// #[cfg(unix)] {
/// use std::ffi::OsStr;
/// use std::os::unix::ffi::OsStrExt;
///