diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-06-13 14:51:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-13 14:51:56 +0200 |
| commit | ca06f8896b62c58fe366bdecf2c237d8a195fd0f (patch) | |
| tree | b5e501c69e7276b2ec9319075ce9ec2417996565 /src/libstd/sys/mod.rs | |
| parent | a0d05150c9f3297d558262e5637521d08f86d8de (diff) | |
| parent | 8eb7f36a3ba06dbea4a44254c3e2d92455ae150f (diff) | |
| download | rust-ca06f8896b62c58fe366bdecf2c237d8a195fd0f.tar.gz rust-ca06f8896b62c58fe366bdecf2c237d8a195fd0f.zip | |
Rollup merge of #61720 - alexcrichton:libstd-cfg-if-dep, r=sfackler
std: Remove internal definitions of `cfg_if!` macro This is duplicated in a few locations throughout the sysroot to work around issues with not exporting a macro in libstd but still wanting it available to sysroot crates to define blocks. Nowadays though we can simply depend on the `cfg-if` crate on crates.io, allowing us to use it from there!
Diffstat (limited to 'src/libstd/sys/mod.rs')
| -rw-r--r-- | src/libstd/sys/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys/mod.rs b/src/libstd/sys/mod.rs index 3f3cedc53b7..21360e2e0f0 100644 --- a/src/libstd/sys/mod.rs +++ b/src/libstd/sys/mod.rs @@ -22,7 +22,7 @@ #![allow(missing_debug_implementations)] -cfg_if! { +cfg_if::cfg_if! { if #[cfg(unix)] { mod unix; pub use self::unix::*; @@ -54,7 +54,7 @@ cfg_if! { // Windows when we're compiling for Linux. #[cfg(rustdoc)] -cfg_if! { +cfg_if::cfg_if! { if #[cfg(any(unix, target_os = "redox"))] { // On unix we'll document what's already available #[stable(feature = "rust1", since = "1.0.0")] @@ -77,7 +77,7 @@ cfg_if! { } #[cfg(rustdoc)] -cfg_if! { +cfg_if::cfg_if! { if #[cfg(windows)] { // On windows we'll just be documenting what's already available #[allow(missing_docs)] |