Skip to content

Update mdbook - #96088

Merged
bors merged 1 commit into
rust-lang:masterfrom
ehuss:update-mdbook
Apr 16, 2022
Merged

Update mdbook#96088
bors merged 1 commit into
rust-lang:masterfrom
ehuss:update-mdbook

Conversation

@ehuss

Copy link
Copy Markdown
Contributor

This just brings in a few small fixes, particularly a rendering fix for chapter names with markdown in them (like the https://doc.rust-lang.org/nightly/rustc/platform-support/kmc-solid.html page). There's also a minor fix for the search index for duplicate headings.

Changelog: https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-0418

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @Mark-Simulacrum

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 15, 2022
@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+ rollup=iffy

@bors

bors commented Apr 15, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 5181422 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 Apr 15, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Apr 15, 2022
Update mdbook
This just brings in a few small fixes, particularly a rendering fix for chapter names with markdown in them (like the https://doc.rust-lang.org/nightly/rustc/platform-support/kmc-solid.html page). There's also a minor fix for the search index for duplicate headings.
Changelog: https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-0418
@Dylan-DPCDylan-DPC mentioned this pull request Apr 15, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Apr 16, 2022
Update mdbook
This just brings in a few small fixes, particularly a rendering fix for chapter names with markdown in them (like the https://doc.rust-lang.org/nightly/rustc/platform-support/kmc-solid.html page). There's also a minor fix for the search index for duplicate headings.
Changelog: https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-0418
@Dylan-DPCDylan-DPC mentioned this pull request Apr 16, 2022
@Dylan-DPC

Copy link
Copy Markdown
Member

failed in rollup

@bors r-

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 16, 2022
@ehuss

Copy link
Copy Markdown
ContributorAuthor

That was not the cause of the rollup failure. The real failure was #93784:

Running 62 rustdoc-gui (16 concurrently) ...
.......... (10/62)
.......... (20/62)
.......... (30/62)
.......... (40/62)
.......... (50/62)
.......... (60/62)
. (62/62)
/checkout/src/test/rustdoc-gui/escape-key.goml escape-key... FAILED
Error: (line 6) TimeoutError: waiting for selector "#search h1" failed: timeout 30000ms exceeded: for command `wait-for: "#search h1" // The search element is empty before the first search `

The embedded-book error was caused by #95372. Books are allowed to fail via the toolstate mechanism https://rust-lang-nursery.github.io/rust-toolstate/ as can be seen here: #96108 (comment)

@bors r=Mark-Simulacrum

@bors

bors commented Apr 16, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 5181422 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 16, 2022
@Dylan-DPCDylan-DPC mentioned this pull request Apr 16, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 16, 2022
Rollup of 7 pull requests
Successful merges:
- rust-lang#94985 (Parse inner attributes on inline const block)
- rust-lang#95006 (Reject `#[thread_local]` attribute on non-static items)
- rust-lang#95426 (Include Refs in Valtree Creation)
- rust-lang#95908 (Inline `shallow_resolve_ty` into `ShallowResolver`)
- rust-lang#96058 (separate flock implementations into separate modules)
- rust-lang#96088 (Update mdbook)
- rust-lang#96118 (rustdoc: Rename `def_id` into `item_id` when the type is `ItemId` for readability)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 5d98ce6 into rust-lang:masterApr 16, 2022
@rustbotrustbot added this to the 1.62.0 milestone Apr 16, 2022
@adamgreig

Copy link
Copy Markdown
Contributor

I've fixed the embedded-book failure upstream in rust-embedded/book#317, @ehuss would you like me to PR updating the submodule here or just wait for another general books update like #95423?

@ehuss

Copy link
Copy Markdown
ContributorAuthor

Thanks for the quick fix! I'll go ahead and post an update shortly.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@ehuss@rust-highfive@Mark-Simulacrum@bors@Dylan-DPC@adamgreig@rustbot