Skip to content

Update books for next release - #51597

Merged
bors merged 1 commit into
rust-lang:masterfrom
Mark-Simulacrum:update-books
Jun 19, 2018
Merged

Update books for next release#51597
bors merged 1 commit into
rust-lang:masterfrom
Mark-Simulacrum:update-books

Conversation

@Mark-Simulacrum

@Mark-Simulacrum Mark-Simulacrum commented Jun 16, 2018

Copy link
Copy Markdown
Member

No description provided.

@steveklabnik

Copy link
Copy Markdown
Contributor

This is going to fail, the book's CI is currently failing. I'm pushing a fix right now.

@steveklabnik

Copy link
Copy Markdown
Contributor

Could you pull from the book again?

r=me when that's done and travis is happy

@Mark-Simulacrum

Copy link
Copy Markdown
Member Author

Pulled, will wait for Travis.

@emilyalbini

Copy link
Copy Markdown
Member

r? @steveklabnik

@emilyalbini emilyalbini added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 16, 2018
@Mark-Simulacrum

Copy link
Copy Markdown
Member Author

Hm, looks like the nomicon is also broken. I'm working on a fix.

@rust-highfive

Copy link
Copy Markdown
Contributor

The job x86_64-gnu-llvm-3.9 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[01:32:36] travis_fold:end:stage0-linkchecker

[01:32:36] travis_time:end:stage0-linkchecker:start=1529180225659282998,finish=1529180228663831317,duration=3004548319

[01:32:52] reference/print.html:2890: broken link - reference/generics.html
[01:32:52] reference/print.html:6271: broken link - reference/traits.html
[01:32:52] reference/print.html:6273: broken link - reference/items/where-clauses.html
[01:32:52] reference/attributes.html:164: broken link - reference/generics.html
[01:32:52] reference/trait-bounds.html:164: broken link - reference/traits.html
[01:32:52] reference/trait-bounds.html:166: broken link - reference/items/where-clauses.html
34916 ./obj/build/x86_64-unknown-linux-gnu/native/jemalloc/src
34844 ./obj/build/x86_64-unknown-linux-gnu/test/run-pass
34588 ./obj/build/x86_64-unknown-linux-gnu/native/jemalloc/lib
34372 ./obj/build/x86_64-unknown-linux-gnu/doc/core/arch

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@Mark-Simulacrum

Copy link
Copy Markdown
Member Author

rust-lang/reference#359 and rust-lang/nomicon#73 need to be merged before this can land.

@kennytm kennytm added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 17, 2018
@steveklabnik

Copy link
Copy Markdown
Contributor

@Mark-Simulacrum both merged now!

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jun 18, 2018
@Mark-Simulacrum

Copy link
Copy Markdown
Member Author

@bors r+

@bors

bors commented Jun 18, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit deaba27 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 18, 2018
@bors

bors commented Jun 19, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit deaba27 with merge 72b0f91...

bors added a commit that referenced this pull request Jun 19, 2018
@bors

bors commented Jun 19, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 72b0f91 to master...

@bors
bors merged commit deaba27 into rust-lang:master Jun 19, 2018
@Mark-Simulacrum
Mark-Simulacrum deleted the update-books branch June 20, 2018 13:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

6 participants