Skip to content

Commit

Permalink
Rollup merge of rust-lang#51642 - GuillaumeGomez:fix-unknown-windows-…
Browse files Browse the repository at this point in the history
…build, r=oli-obk

Fix unknown windows build

Fixes rust-lang#51618.
  • Loading branch information
pietroalbini authored Jun 26, 2018
2 parents 756b694 + 3c6c18d commit 1215965
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/libstd/sys/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ cfg_if! {
// (missing things in `libc` which is empty) so just omit everything
// with an empty module
#[unstable(issue = "0", feature = "std_internals")]
#[allow(missing_docs)]
pub mod unix_ext {}
} else {
// On other platforms like Windows document the bare bones of unix
Expand All @@ -80,11 +81,13 @@ cfg_if! {
cfg_if! {
if #[cfg(windows)] {
// On windows we'll just be documenting what's already available
#[allow(missing_docs)]
pub use self::ext as windows_ext;
} else if #[cfg(any(target_os = "cloudabi", target_arch = "wasm32"))] {
// On CloudABI and wasm right now the shim below doesn't compile, so
// just omit it
#[unstable(issue = "0", feature = "std_internals")]
#[allow(missing_docs)]
pub mod windows_ext {}
} else {
// On all other platforms (aka linux/osx/etc) then pull in a "minimal"
Expand Down

0 comments on commit 1215965

Please sign in to comment.