Skip to content

Disable linux_ext in wasm32 and fortanix rustdoc builds. #106618

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Jan 29, 2023
Merged

Disable linux_ext in wasm32 and fortanix rustdoc builds. #106618

merged 1 commit into from
Jan 29, 2023

Conversation

jmillikin
Copy link
Contributor

@jmillikin jmillikin commented Jan 9, 2023 •
edited by JohnTitor
Loading

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

@rustbot
Copy link
Collaborator

rustbot commented Jan 9, 2023

r? @joshtriplett

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jan 9, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jan 9, 2023

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@jmillikin jmillikin mentioned this pull request Jan 9, 2023
Closed
@jmillikin
Disable linux_ext in wasm32 and fortanix rustdoc builds.
92aa5f6 
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`.
@jmillikin jmillikin force-pushed the os-net-rustdoc-wasm32 branch from fa5fb62 to 92aa5f6 Compare January 9, 2023 05:07
@JohnTitor
Copy link
Member

Makes sense to me, r? JohnTitor @bors r+

@bors
Copy link
Collaborator

bors commented Jan 29, 2023

📌 Commit 92aa5f6 has been approved by JohnTitor

It is now in the queue for this repository.

@rustbot rustbot assigned JohnTitor and unassigned joshtriplett Jan 29, 2023
@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 29, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 29, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 29, 2023
@bors
Auto merge of rust-lang#107435 - matthiaskrgr:rollup-if5h6yu, r=matth…
a29efcc 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#106618 (Disable `linux_ext` in wasm32 and fortanix rustdoc builds.)
 - rust-lang#107097 (Fix def-use dominance check)
 - rust-lang#107154 (library/std/sys_common: Define MIN_ALIGN for m68k-unknown-linux-gnu)
 - rust-lang#107397 (Gracefully exit if --keep-stage flag is used on a clean source tree)
 - rust-lang#107401 (remove the usize field from CandidateSource::AliasBound)
 - rust-lang#107413 (make more pleasant to read)
 - rust-lang#107422 (Also erase substs for new infcx in pin move error)
 - rust-lang#107425 (Check for missing space between fat arrow and range pattern)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0f86ada into rust-lang:master Jan 29, 2023
@rustbot rustbot added this to the 1.69.0 milestone Jan 29, 2023
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@JohnTitor JohnTitor JohnTitor approved these changes

Assignees

@JohnTitor JohnTitor

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.69.0
Development

Successfully merging this pull request may close these issues.

Cannot build rust nightly: unresolved import crate::os::unix::net
5 participants
@jmillikin @rustbot @JohnTitor @bors @joshtriplett