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

update mdbook #49623

Merged
merged 1 commit into from Apr 7, 2018
Merged

update mdbook #49623

merged 1 commit into from Apr 7, 2018

Conversation

steveklabnik
Copy link
Member

This includes search for all books, a long-requested feature!

@steveklabnik steveklabnik added the relnotes Marks issues that should be documented in the release notes of the next release. label Apr 3, 2018
@GuillaumeGomez
Copy link
Member

Seems pretty safe to include it so let's go!

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Apr 3, 2018

📌 Commit 3d9b3e3 has been approved by GuillaumeGomez

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 3, 2018
@mattico
Copy link
Contributor

mattico commented Apr 3, 2018

Note that there are a few relatively minor issues related to the search CSS/JS. It shouldn't be too long until there's another release that includes those fixes. I'll try to remember to send a PR updating MDBook again when that happens.

kennytm added a commit to kennytm/rust that referenced this pull request Apr 3, 2018
…aumeGomez

update mdbook

This includes search for all books, a long-requested feature!
bors added a commit that referenced this pull request Apr 3, 2018
Rollup of 14 pull requests

Successful merges:

 - #49179 (Handle future deprecation annotations )
 - #49512 (Add support for variant and types fields for intra links)
 - #49516 (Add missing anchor for union type fields)
 - #49532 (Add test for rustdoc ignore test)
 - #49533 (Add #[must_use] to a few standard library methods)
 - #49570 (avoid IdxSets containing garbage above the universe length)
 - #49594 (Add some performance guidance to std::fs and std::io docs)
 - #49599 (Fix typo)
 - #49603 (Fix url for intra link provided method)
 - #49609 (run-pass/attr-stmt-expr: expand test cases)
 - #49612 (Fix "since" version for getpid feature.)
 - #49618 (Fix build error when compiling libcore for 16bit targets)
 - #49619 (tweak core::fmt docs)
 - #49623 (update mdbook)

Failed merges:
@bors
Copy link
Contributor

bors commented Apr 4, 2018

☔ The latest upstream changes (presumably #48913) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors 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 4, 2018
This includes search for all books, a long-requested feature!
@steveklabnik
Copy link
Member Author

Rebased!

@kennytm kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 5, 2018
@GuillaumeGomez
Copy link
Member

Then let's give it another try!

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Apr 5, 2018

📌 Commit ecfbaca has been approved by GuillaumeGomez

@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 Apr 5, 2018
@Mark-Simulacrum
Copy link
Member

@bors p=1 (this changes lockfiles which are often a cause of rebase pain, let's bump it higher)

@Mark-Simulacrum
Copy link
Member

Uh, @bors rollup- perhaps?

kennytm added a commit to kennytm/rust that referenced this pull request Apr 6, 2018
…aumeGomez

update mdbook

This includes search for all books, a long-requested feature!
@bors
Copy link
Contributor

bors commented Apr 7, 2018

⌛ Testing commit ecfbaca with merge 5911314...

bors added a commit that referenced this pull request Apr 7, 2018
update mdbook

This includes search for all books, a long-requested feature!
@bors
Copy link
Contributor

bors commented Apr 7, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: GuillaumeGomez
Pushing 5911314 to master...

@bors bors merged commit ecfbaca into rust-lang:master Apr 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
relnotes Marks issues that should be documented in the release notes of the next release. S-waiting-on-bors Status: 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.

None yet

7 participants