diff --git a/ci/dox.sh b/ci/dox.sh index 85e92439484c6a80db71b7039e3a3184cac0f3bb..b8ffa7dd0d0741a237e07c8ededf4167192ba60a 100644 --- a/ci/dox.sh +++ b/ci/dox.sh @@ -16,7 +16,7 @@ cp ci/landing-page-head.html target/doc/index.html for target in $TARGETS; do echo documenting $target - rustdoc -o target/doc/$target --target $target src/lib.rs --cfg dox \ + rustdoc -o target/doc/$target --target $target src/lib.rs --cfg cross_platform_docs \ --crate-name libc echo "<li><a href="/libc/$target/libc/index.html">$target</a></li>" \ diff --git a/src/dox.rs b/src/dox.rs index 5c095b9c76ad8c13e645903333f64563a7d4b1e8..1aea62d0211e3f5046947a2dedba6835177e54e7 100644 --- a/src/dox.rs +++ b/src/dox.rs @@ -1,6 +1,6 @@ pub use self::imp::*; -#[cfg(not(dox))] +#[cfg(not(cross_platform_docs))] mod imp { pub use core::option::Option; pub use core::clone::Clone; @@ -8,7 +8,7 @@ mod imp { pub use core::mem; } -#[cfg(dox)] +#[cfg(cross_platform_docs)] mod imp { pub enum Option<T> { Some(T), diff --git a/src/lib.rs b/src/lib.rs index e17bc50f6e5ece1db33a41a09fafdb4cb1a5c50b..255548066518578eef61a4cf0f050e80b567b0d7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -13,8 +13,8 @@ #![allow(bad_style, overflowing_literals, improper_ctypes)] #![crate_type = "rlib"] #![crate_name = "libc"] -#![cfg_attr(dox, feature(no_core, lang_items))] -#![cfg_attr(dox, no_core)] +#![cfg_attr(cross_platform_docs, feature(no_core, lang_items))] +#![cfg_attr(cross_platform_docs, no_core)] #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", html_favicon_url = "https://doc.rust-lang.org/favicon.ico")] @@ -97,7 +97,7 @@ #![cfg_attr(not(feature = "use_std"), no_std)] -#[cfg(all(not(dox), feature = "use_std"))] +#[cfg(all(not(cross_platform_docs), feature = "use_std"))] extern crate std as core; #[macro_use] mod macros; diff --git a/src/macros.rs b/src/macros.rs index 8429442014418afc81933cf6dd98adebfe3411fc..0e13bfcf46611bc7c8c3684f188fdb2bc7ee8186 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -53,12 +53,12 @@ macro_rules! f { $($body:stmt);* })*) => ($( #[inline] - #[cfg(not(dox))] + #[cfg(not(cross_platform_docs))] pub unsafe extern fn $i($($arg: $argty),*) -> $ret { $($body);* } - #[cfg(dox)] + #[cfg(cross_platform_docs)] #[allow(dead_code)] pub unsafe extern fn $i($($arg: $argty),*) -> $ret { loop {} diff --git a/src/unix/mod.rs b/src/unix/mod.rs index 134f44c5a8dec0ea16d541960faf5f3ea776b77f..d6cde7ae71182fa900b20d103ec49b4dde189917 100644 --- a/src/unix/mod.rs +++ b/src/unix/mod.rs @@ -269,7 +269,7 @@ pub const INADDR_BROADCAST: in_addr_t = 4294967295; pub const INADDR_NONE: in_addr_t = 4294967295; cfg_if! { - if #[cfg(dox)] { + if #[cfg(cross_platform_docs)] { // on dox builds don't pull in anything } else if #[cfg(target_os = "l4re")] { // required libraries for L4Re are linked externally, ATM