rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rollup merge of #51642 - GuillaumeGomez:fix-unknown-windows-build, r=oli-obk

Browse Source 
Fix unknown windows build

Fixes #51618.
This commit is contained in:
Pietro Albini
2018-06-26 11:35:35 +02:00
committed by GitHub
parent 756b69492b 3c6c18d095
commit 1215965a12
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libstd/sys/mod.rs
View File

@@ -67,6 +67,7 @@ cfg_if! {
// (missing things in `libc` which is empty) so just omit everything // (missing things in `libc` which is empty) so just omit everything
// with an empty module // with an empty module
#[unstable(issue = "0", feature = "std_internals")] #[unstable(issue = "0", feature = "std_internals")]
#[allow(missing_docs)]
pub mod unix_ext {} pub mod unix_ext {}
} else { } else {
// On other platforms like Windows document the bare bones of unix // On other platforms like Windows document the bare bones of unix
@@ -80,11 +81,13 @@ cfg_if! {
cfg_if! { cfg_if! {
if #[cfg(windows)] { if #[cfg(windows)] {
// On windows we'll just be documenting what's already available // On windows we'll just be documenting what's already available
#[allow(missing_docs)]
pub use self::ext as windows_ext; pub use self::ext as windows_ext;
} else if #[cfg(any(target_os = "cloudabi", target_arch = "wasm32"))] { } else if #[cfg(any(target_os = "cloudabi", target_arch = "wasm32"))] {
// On CloudABI and wasm right now the shim below doesn't compile, so // On CloudABI and wasm right now the shim below doesn't compile, so
// just omit it // just omit it
#[unstable(issue = "0", feature = "std_internals")] #[unstable(issue = "0", feature = "std_internals")]
#[allow(missing_docs)]
pub mod windows_ext {} pub mod windows_ext {}
} else { } else {
// On all other platforms (aka linux/osx/etc) then pull in a "minimal" // On all other platforms (aka linux/osx/etc) then pull in a "minimal"