]> git.lizzy.rs Git - rust.git/commitdiff
Disable `linux_ext` in wasm32 and fortanix rustdoc builds.
authorJohn Millikin <john@john-millikin.com>
Mon, 9 Jan 2023 04:54:21 +0000 (13:54 +0900)
committerJohn Millikin <john@john-millikin.com>
Mon, 9 Jan 2023 05:07:05 +0000 (14:07 +0900)
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`.

library/std/src/os/net/mod.rs

index 5ec267c41e97ca77a5e3a920b30c918633e2fd77..b7046dd7c598c923f80b9bf470d957ebd64851f1 100644 (file)
@@ -1,4 +1,13 @@
 //! 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))]
 pub(super) mod linux_ext;