Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Apply --cfg parallel_compiler when documenting #84777

Merged
merged 1 commit into from
May 11, 2021

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented May 1, 2021

This also reverts commit 9823c2c working around the bug.

Fixes #82301.

This also reverts commit 9823c2c
working around the bug.
@jyn514 jyn514 added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-contributor-roadblock Area: Makes things more difficult for new contributors to rust itself labels May 1, 2021
@rust-highfive
Copy link
Collaborator

r? @estebank

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 1, 2021
@jyn514
Copy link
Member Author

jyn514 commented May 7, 2021

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 10, 2021

📌 Commit 1da4445 has been approved by Mark-Simulacrum

@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 May 10, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request May 10, 2021
…ulacrum

Apply `--cfg parallel_compiler` when documenting

This also reverts commit 9823c2c working around the bug.

Fixes rust-lang#82301.
bors added a commit to rust-lang-ci/rust that referenced this pull request May 11, 2021
Rollup of 7 pull requests

Successful merges:

 - rust-lang#84777 (Apply `--cfg parallel_compiler` when documenting)
 - rust-lang#84783 (Allow formatting specific subdirectories)
 - rust-lang#84998 (Show nicer error when an 'unstable fingerprints' error occurs)
 - rust-lang#85002 (RELEASES.md: Use broken_intra_doc_links as an example, not nightly lint)
 - rust-lang#85051 (Allow checking miri and RLS with `x.py check src/tools/{miri,rls}`)
 - rust-lang#85114 (Remove outdated FIXME for download-rustc)
 - rust-lang#85143 (Document Rc::from)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 5fc8987 into rust-lang:master May 11, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 11, 2021
@jyn514 jyn514 deleted the rustdoc-parallel branch May 11, 2021 13:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-contributor-roadblock Area: Makes things more difficult for new contributors to rust itself S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rustdoc does not apply cfg(parallel_compiler) when bootstrapping
6 participants