Skip to content

Fix building compiler docs with stage 0 - #79954

Merged
bors merged 1 commit into
rust-lang:masterfrom
jyn514:normalize-oops
Dec 13, 2020
Merged

Fix building compiler docs with stage 0#79954
bors merged 1 commit into
rust-lang:masterfrom
jyn514:normalize-oops

Conversation

@jyn514

@jyn514jyn514 commented Dec 12, 2020

Copy link
Copy Markdown
Member

@jyn514jyn514 added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Dec 12, 2020
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 12, 2020
camelid
camelid reviewed Dec 12, 2020
View reviewed changes
Comment threadsrc/bootstrap/doc.rs Outdated
@jyn514

jyn514 commented Dec 12, 2020

Copy link
Copy Markdown
MemberAuthor

Err, this didn't completely work:

thread 'rustc' panicked at 'Unable to resolve external crate proc_macro2', src/librustdoc/core.rs:457:37
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
error: internal compiler error: unexpected panic
error: Unrecognized option: 'crate-version'
error: could not document `coverage_test_macros`

I'm not sure if this is a rustdoc bug or a bootstrap bug :/ doc --stage 1 works fine and the panic comes from

rust/src/librustdoc/core.rs

Line 448 in c3ed668

panic!("Unable to resolve external crate {}", extern_name)
which I haven't seen to fail before.

@NadrierilNadrieril mentioned this pull request Dec 12, 2020
Closed
@Mark-Simulacrum

Mark-Simulacrum commented Dec 12, 2020

Copy link
Copy Markdown
Member

@bors r+

This fix seems correct in the meantime.

@bors

bors commented Dec 12, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 9df0348 has been approved by Mark-Simulacrum

@borsbors 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 Dec 12, 2020
@JohnTitorJohnTitor mentioned this pull request Dec 13, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 13, 2020
@bors
Auto merge ofrust-lang#79994- JohnTitor:rollup-43wl2uj, r=JohnTitor
1281315
Rollup of 12 pull requests
Successful merges:
- rust-lang#79360 (std::iter: document iteration over `&T` and `&mut T`)
- rust-lang#79398 (Link loop/for keyword)
- rust-lang#79834 (Remove deprecated linked_list_extras methods.)
- rust-lang#79845 (Fix rustup support in default_build_triple for python3)
- rust-lang#79940 (fix more clippy::complexity findings)
- rust-lang#79942 (Add post-init hook for static memory for miri.)
- rust-lang#79954 (Fix building compiler docs with stage 0)
- rust-lang#79963 (Fix typo in `DebruijnIndex` documentation)
- rust-lang#79970 (Misc rustbuild improvements when the LLVM backend isn't used)
- rust-lang#79973 (rustdoc light theme: Fix CSS for selected buttons)
- rust-lang#79984 (Remove an unused dependency that made `rustdoc` crash)
- rust-lang#79985 (Fixes submit event of the search input)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 54119d4 into rust-lang:masterDec 13, 2020
@rustbotrustbot added this to the 1.50.0 milestone Dec 13, 2020
@jyn514
jyn514 deleted the normalize-oops branch December 13, 2020 14:13
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@camelidcamelidcamelid left review comments

Assignees

@Mark-SimulacrumMark-Simulacrum

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.50.0

Development

Successfully merging this pull request may close these issues.

6 participants

@jyn514@Mark-Simulacrum@bors@camelid@rust-highfive@rustbot