mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #106618 - jmillikin:os-net-rustdoc-wasm32, r=JohnTitor

Browse Source 
Disable `linux_ext` in wasm32 and fortanix rustdoc builds.

The `std::os::unix` module is stubbed out when building docs for these target platforms. The introduction of Linux-specific extension traits caused `std::os::net` to depend on sub-modules of `std::os::unix`, which broke rustdoc for the `wasm32-unknown-unknown` target.

Adding an additional `#[cfg]` guard solves that rustdoc failure by not declaring `linux_ext` on targets with a stubbed `std::os::unix`.

Fixes #105467
This commit is contained in:
Matthias Krüger 2023-01-29 06:14:16 +01:00 committed by GitHub
commit 0f86ada9d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/std/src/os/net/mod.rs
View File

@ -1,4 +1,13 @@
//! OS-specific networking functionality. //! OS-specific networking functionality.
// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must
// be special-cased during rustdoc generation.
#[cfg(not(all(
doc,
any(
all(target_arch = "wasm32", not(target_os = "wasi")),
all(target_vendor = "fortanix", target_env = "sgx")
)
)))]
#[cfg(any(target_os = "linux", target_os = "android", doc))] #[cfg(any(target_os = "linux", target_os = "android", doc))]
pub(super) mod linux_ext; pub(super) mod linux_ext;