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

Add the 2018 edition of the book to doc.rust-lang.org #50952

Merged
merged 1 commit into from
May 22, 2018

Conversation

steveklabnik
Copy link
Member

The second edition of the book is on its way to the printers, and as such, is frozen. We've forked off the 2018 edition to add new stuff to; this PR now builds it so that people can read it on doc.rust-lang.org.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

warning Warning warning

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 21, 2018
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented May 21, 2018

📌 Commit 8ee3f67 has been approved by alexcrichton

@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 May 21, 2018
@alexcrichton
Copy link
Member

🌴

@rust-highfive
Copy link
Collaborator

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:52:07] travis_fold:end:stage0-linkchecker

[01:52:07] travis_time:end:stage0-linkchecker:start=1526948181861338750,finish=1526948185094104534,duration=3232765784

[01:52:18] book/type-aliases.html:42: broken link fragment `#type-aliases-create-type-synonyms` pointing to `book/second-edition/ch19-04-advanced-types.html`
[01:52:18] book/unsized-types.html:46: broken link fragment `#dynamically-sized-types-and-sized` pointing to `book/second-edition/ch19-04-advanced-types.html`
[01:52:18] book/associated-types.html:45: broken link fragment `#associated-types-specify-placeholder-types-in-trait-definitions` pointing to `book/second-edition/ch19-03-advanced-traits.html`
[01:52:26] thread 'main' panicked at 'found some broken links', tools/linkchecker/main.rs:49:9
[01:52:26] 
[01:52:26] 
[01:52:26] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/linkchecker" "/checkout/obj/build/x86_64-unknown-linux-gnu/doc"
[01:52:26] expected success, got: exit code: 101
[01:52:26] expected success, got: exit code: 101
[01:52:26] 
[01:52:26] 
[01:52:26] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:52:26] Build completed unsuccessfully in 0:54:44
[01:52:26] Makefile:58: recipe for target 'check' failed
[01:52:26] make: *** [check] Error 1

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:01a130ac
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

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)

@kennytm
Copy link
Member

kennytm commented May 22, 2018

@bors r- ↑ broken links

@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 May 22, 2018
@steveklabnik
Copy link
Member Author

This is.... extremely confusing. Apparently, it just straight-up doesn't build the second edition now. When I tested locally, I checked that the 2018 edition was produced, but didn't re-load the second edition... I have no idea why this is. Hrm.

@steveklabnik
Copy link
Member Author

It does claim that it builds it:

Rustbook (x86_64-pc-windows-msvc) - unstable-book
Rustbook (x86_64-pc-windows-msvc) - book/first-edition
Rustbook (x86_64-pc-windows-msvc) - book/second-edition
Rustbook (x86_64-pc-windows-msvc) - book/2018-edition

@steveklabnik
Copy link
Member Author

Okay, on a re-build, it is there. must have just been me locally. ignore the noise, sorry.

@steveklabnik
Copy link
Member Author

@bors: r=alexcrichton rollup

tested locally, should all be good now

@bors
Copy link
Contributor

bors commented May 22, 2018

📌 Commit 292be70 has been approved by alexcrichton

@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 May 22, 2018
kennytm added a commit to kennytm/rust that referenced this pull request May 22, 2018
Add the 2018 edition of the book to doc.rust-lang.org

The second edition of the book is on its way to the printers, and as such, is frozen. We've forked off the 2018 edition to add new stuff to; this PR now builds it so that people can read it on doc.rust-lang.org.
bors added a commit that referenced this pull request May 22, 2018
Rollup of 15 pull requests

Successful merges:

 - #50846 (Add E0665)
 - #50849 (CheckLoopVisitor: also visit closure arguments)
 - #50863 (Make `[T]::len` and `str::len` const fn)
 - #50875 (rustdoc: use "short form" doc(cfg) printing even when combined with other conditionals)
 - #50913 (Fix typo in cell.rs)
 - #50914 (Issue #50636: Improve error diagnostic with missing commas after struct fields.)
 - #50931 (Inline `try_get`.)
 - #50932 (Optimize seen Predicate filtering.)
 - #50945 (Stabilize feature from_ref)
 - #50946 (rustc: Fix procedural macros generating lifetime tokens)
 - #50947 (rustdoc: set tab width in rust source blocks)
 - #50952 (Add the 2018 edition of the book to doc.rust-lang.org)
 - #50958 (Micro-optimization on PR#50697)
 - #50961 (Fix FileCheck finding with MSVC)
 - #50963 (Right-size the `VecDeque` in `coerce_unsized`.)

Failed merges:
@bors bors merged commit 292be70 into rust-lang:master May 22, 2018
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.

5 participants