diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2019-11-06 18:32:51 +0100 |
|---|---|---|
| committer | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2019-11-06 18:32:51 +0100 |
| commit | 0282c27781b2f7501f4385ef22da82acc179c00e (patch) | |
| tree | f55208a7cfe650d195d2beb5581f288ffee16b3b /src/libstd | |
| parent | e8b190ac4ad79e58d21ee1d573529ff74d8eedaa (diff) | |
| download | rust-0282c27781b2f7501f4385ef22da82acc179c00e.tar.gz rust-0282c27781b2f7501f4385ef22da82acc179c00e.zip | |
rename cfg(rustdoc) into cfg(doc)
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/os/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/mod.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/unix/mod.rs | 30 | ||||
| -rw-r--r-- | src/libstd/sys_common/mod.rs | 2 |
4 files changed, 19 insertions, 19 deletions
diff --git a/src/libstd/os/mod.rs b/src/libstd/os/mod.rs index d44c8ca544e..a8d2b0cb397 100644 --- a/src/libstd/os/mod.rs +++ b/src/libstd/os/mod.rs @@ -4,7 +4,7 @@ #![allow(missing_docs, nonstandard_style, missing_debug_implementations)] cfg_if::cfg_if! { - if #[cfg(rustdoc)] { + if #[cfg(doc)] { // When documenting libstd we want to show unix/windows/linux modules as // these are the "main modules" that are used across platforms. This diff --git a/src/libstd/sys/mod.rs b/src/libstd/sys/mod.rs index 16b0539cdb9..9eeab34643f 100644 --- a/src/libstd/sys/mod.rs +++ b/src/libstd/sys/mod.rs @@ -56,7 +56,7 @@ cfg_if::cfg_if! { // then later used in the `std::os` module when documenting, for example, // Windows when we're compiling for Linux. -#[cfg(rustdoc)] +#[cfg(doc)] cfg_if::cfg_if! { if #[cfg(unix)] { // On unix we'll document what's already available @@ -80,7 +80,7 @@ cfg_if::cfg_if! { } } -#[cfg(rustdoc)] +#[cfg(doc)] cfg_if::cfg_if! { if #[cfg(windows)] { // On windows we'll just be documenting what's already available diff --git a/src/libstd/sys/unix/mod.rs b/src/libstd/sys/unix/mod.rs index d0bed0f038e..bf0166ceb6f 100644 --- a/src/libstd/sys/unix/mod.rs +++ b/src/libstd/sys/unix/mod.rs @@ -2,21 +2,21 @@ use crate::io::ErrorKind; -#[cfg(any(rustdoc, target_os = "linux"))] pub use crate::os::linux as platform; - -#[cfg(all(not(rustdoc), target_os = "android"))] pub use crate::os::android as platform; -#[cfg(all(not(rustdoc), target_os = "dragonfly"))] pub use crate::os::dragonfly as platform; -#[cfg(all(not(rustdoc), target_os = "freebsd"))] pub use crate::os::freebsd as platform; -#[cfg(all(not(rustdoc), target_os = "haiku"))] pub use crate::os::haiku as platform; -#[cfg(all(not(rustdoc), target_os = "ios"))] pub use crate::os::ios as platform; -#[cfg(all(not(rustdoc), target_os = "macos"))] pub use crate::os::macos as platform; -#[cfg(all(not(rustdoc), target_os = "netbsd"))] pub use crate::os::netbsd as platform; -#[cfg(all(not(rustdoc), target_os = "openbsd"))] pub use crate::os::openbsd as platform; -#[cfg(all(not(rustdoc), target_os = "solaris"))] pub use crate::os::solaris as platform; -#[cfg(all(not(rustdoc), target_os = "emscripten"))] pub use crate::os::emscripten as platform; -#[cfg(all(not(rustdoc), target_os = "fuchsia"))] pub use crate::os::fuchsia as platform; -#[cfg(all(not(rustdoc), target_os = "l4re"))] pub use crate::os::linux as platform; -#[cfg(all(not(rustdoc), target_os = "redox"))] pub use crate::os::redox as platform; +#[cfg(any(doc, target_os = "linux"))] pub use crate::os::linux as platform; + +#[cfg(all(not(doc), target_os = "android"))] pub use crate::os::android as platform; +#[cfg(all(not(doc), target_os = "dragonfly"))] pub use crate::os::dragonfly as platform; +#[cfg(all(not(doc), target_os = "freebsd"))] pub use crate::os::freebsd as platform; +#[cfg(all(not(doc), target_os = "haiku"))] pub use crate::os::haiku as platform; +#[cfg(all(not(doc), target_os = "ios"))] pub use crate::os::ios as platform; +#[cfg(all(not(doc), target_os = "macos"))] pub use crate::os::macos as platform; +#[cfg(all(not(doc), target_os = "netbsd"))] pub use crate::os::netbsd as platform; +#[cfg(all(not(doc), target_os = "openbsd"))] pub use crate::os::openbsd as platform; +#[cfg(all(not(doc), target_os = "solaris"))] pub use crate::os::solaris as platform; +#[cfg(all(not(doc), target_os = "emscripten"))] pub use crate::os::emscripten as platform; +#[cfg(all(not(doc), target_os = "fuchsia"))] pub use crate::os::fuchsia as platform; +#[cfg(all(not(doc), target_os = "l4re"))] pub use crate::os::linux as platform; +#[cfg(all(not(doc), target_os = "redox"))] pub use crate::os::redox as platform; pub use self::rand::hashmap_random_keys; pub use libc::strlen; diff --git a/src/libstd/sys_common/mod.rs b/src/libstd/sys_common/mod.rs index 7a0bcd03d75..8912aed9255 100644 --- a/src/libstd/sys_common/mod.rs +++ b/src/libstd/sys_common/mod.rs @@ -45,7 +45,7 @@ pub mod backtrace; pub mod condvar; pub mod io; pub mod mutex; -#[cfg(any(rustdoc, // see `mod os`, docs are generated for multiple platforms +#[cfg(any(doc, // see `mod os`, docs are generated for multiple platforms unix, target_os = "redox", target_os = "cloudabi", |
