/rust

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

Conversation

Reviewers
No reviews
Assignees

@aturon aturon

Labels
Projects
None yet
Milestone
No milestone
7 participants
@steveklabnik @GuillaumeGomez @bors @mattico @Mark-Simulacrum @aturon @kennytm
@steveklabnik
Member

steveklabnik commented Apr 3, 2018

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

@steveklabnik steveklabnik added the relnotes label Apr 3, 2018

@rust-highfive rust-highfive assigned aturon Apr 3, 2018

@GuillaumeGomez

This comment has been minimized.

Sign in to view
Member

GuillaumeGomez commented Apr 3, 2018

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

@bors: r+ rollup
@bors

This comment has been minimized.

Sign in to view
Contributor

bors commented Apr 3, 2018

📌 Commit 3d9b3e3 has been approved by GuillaumeGomez

@bors bors added the S-waiting-on-bors label Apr 3, 2018

@mattico

This comment has been minimized.

Sign in to view
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 kennytm referenced this pull request Apr 3, 2018

Closed

Rollup of 14 pull requests #49620

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

@kennytm
Rollup merge of rust-lang#49623 - steveklabnik:update-mdbook, r=Guill… 
…aumeGomez

update mdbook

This includes search for all books, a long-requested feature!
Verified
This commit was signed with a verified signature.
@kennytm kennytm
GPG key ID: FEF6C8051D0E013C Learn about signing commits
fa5d2e2

bors added a commit that referenced this pull request Apr 3, 2018

@bors
Auto merge of #49620 - kennytm:rollup, r=kennytm 
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:
Loading status checks…
f6419b1

kennytm added a commit to kennytm/rust that referenced this pull request Apr 4, 2018

@kennytm
Rollup merge of rust-lang#49623 - steveklabnik:update-mdbook, r=Guill… 
…aumeGomez

update mdbook

This includes search for all books, a long-requested feature!
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
6718220

@kennytm kennytm referenced this pull request Apr 4, 2018

Merged

Rollup of 25 pull requests #49642

bors added a commit that referenced this pull request Apr 4, 2018

@bors
Auto merge of #49642 - kennytm:rollup, r=kennytm 
Rollup of 20 pull requests

Successful merges:

 - #49179 (Handle future deprecation annotations )
 - #49512 (Add support for variant and types fields for intra links)
 - #49515 (fix targetted value background)
 - #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)
 - #49540 (Fix miri Discriminant() for non-ADT)
 - #49559 (Introduce Vec::resize_with method (see #41758))
 - #49570 (avoid IdxSets containing garbage above the universe length)
 - #49577 (Stabilize String::replace_range)
 - #49599 (Fix typo)
 - #49603 (Fix url for intra link provided method)
 - #49607 (Stabilize iterator methods in 1.27)
 - #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)
 - #49637 (Stabilize parent_id())
 - #49639 (Update Cargo)

Failed merges:
Loading status checks…
57e0f85
@bors

This comment has been minimized.

Sign in to view
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 and removed S-waiting-on-bors labels Apr 4, 2018

@steveklabnik
update mdbook 
This includes search for all books, a long-requested feature!
Loading status checks…
ecfbaca
@steveklabnik

This comment has been minimized.

Sign in to view
Member

steveklabnik commented Apr 5, 2018

Rebased!

@kennytm kennytm added S-waiting-on-review and removed S-waiting-on-author labels Apr 5, 2018

@GuillaumeGomez

This comment has been minimized.

Sign in to view
Member

GuillaumeGomez commented Apr 5, 2018

Then let's give it another try!

@bors: r+ rollup
@bors

This comment has been minimized.

Sign in to view
Contributor

bors commented Apr 5, 2018

📌 Commit ecfbaca has been approved by GuillaumeGomez

@bors bors added S-waiting-on-bors and removed S-waiting-on-review labels Apr 5, 2018

@Mark-Simulacrum

This comment has been minimized.

Sign in to view
Member

Mark-Simulacrum commented Apr 6, 2018

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

This comment has been minimized.

Sign in to view
Member

Mark-Simulacrum commented Apr 6, 2018

Uh, @bors rollup- perhaps?

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

@kennytm
Rollup merge of rust-lang#49623 - steveklabnik:update-mdbook, r=Guill… 
…aumeGomez

update mdbook

This includes search for all books, a long-requested feature!
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
f2f770b

@kennytm kennytm referenced this pull request Apr 6, 2018

Closed

Rollup of 8 pull requests #49744

bors added a commit that referenced this pull request Apr 6, 2018

@bors
Auto merge of #49744 - kennytm:rollup, r=kennytm 
Rollup of 8 pull requests

Successful merges:

 - #49488 (std: Minimize size of panicking on wasm)
 - #49510 (Fix anchor position on fields)
 - #49623 (update mdbook)
 - #49652 (Fix anchors issue when everything is collapsed)
 - #49702 (std: Inline some Termination-related methods)
 - #49721 (bootstrap: Remove the help fast path)
 - #49731 (add THUMB targets to rustup manifest)
 - #49742 (Using X headings instead of 0.X #49739)

Failed merges:
Loading status checks…
0cd1924
@bors

This comment has been minimized.

Sign in to view
Contributor

bors commented Apr 7, 2018

⌛️ Testing commit ecfbaca with merge 5911314...

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

@bors
Auto merge of #49623 - steveklabnik:update-mdbook, r=GuillaumeGomez 
update mdbook

This includes search for all books, a long-requested feature!
Loading status checks…
5911314
@bors

This comment has been minimized.

Sign in to view
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
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment