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 the book to fix some edition-related bugs #56615

Merged
merged 1 commit into from
Dec 9, 2018
Merged

Update the book to fix some edition-related bugs #56615

merged 1 commit into from
Dec 9, 2018

Conversation

carols10cents
Copy link
Member

I'd love to have this included in a point release if one happens, but the changes aren't worth doing a point release on their own IMO. I'd definitely like to see this backported to beta.

The most urgent changes included here are:

There are other small corrections included that were made since the last time the book was updated, but those aren't urgent.

cc @steveklabnik

@carols10cents carols10cents added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Dec 7, 2018
@rust-highfive
Copy link
Collaborator

r? @GuillaumeGomez

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

@rust-highfive
Copy link
Collaborator

⚠️ 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 Dec 7, 2018
@GuillaumeGomez
Copy link
Member

Thanks!

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Dec 8, 2018

📌 Commit 9d75198 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 Dec 8, 2018
@bors
Copy link
Contributor

bors commented Dec 8, 2018

⌛ Testing commit 9d75198 with merge d7a9d96...

bors added a commit that referenced this pull request Dec 8, 2018
Update the book to fix some edition-related bugs

I'd love to have this included in a point release if one happens, but the changes aren't worth doing a point release on their own IMO. I'd definitely like to see this backported to beta.

The most urgent changes included here are:

- Chapter 19.6, on macros (including the macro changes that just stabilized), [is cut off](rust-lang/book#1668) because of an ill-placed newline in a comment that [pulldown-cmark interprets incorrectly](pulldown-cmark/pulldown-cmark#124).
- [The `Cargo.toml` shown in the Guessing Game example in Chapter 2 (and one in Chapter 14) doesn't have `edition="2018"`](rust-lang/book#1671), which can be confusing depending on whether the readers have it in theirs or not, think they should remove it if they have it, and the rest of the chapter assumes it's there and the code doesn't compile if you don't have it.
- The redirects implemented as part of only shipping the 2018 edition of the book sometimes lead to [having to click through 2 redirect pages](rust-lang/book#1667) when it could be just one.

There are other small corrections included that were made since the last time the book was updated, but those aren't urgent.

cc @steveklabnik
@bors
Copy link
Contributor

bors commented Dec 9, 2018

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

@bors bors merged commit 9d75198 into rust-lang:master Dec 9, 2018
@carols10cents
Copy link
Member Author

Thanks @GuillaumeGomez!

Should I open another PR for backporting to beta, @Mark-Simulacrum ? And are the labels sufficient to get this picked up if a stable point release happens?

@Mark-Simulacrum
Copy link
Member

@carols10cents The release team will roll this up into both stable and beta backports (beta for sure, stable if indeed we release a point release). However, this PR does need to be marked beta-accepted and stable-accpeted as well if that is to happen -- right now it's just nominated; it'll need to be accepted for the backport to happen.

@pnkfelix pnkfelix added the A-docs Area: Documentation for any part of the project, including the compiler, standard library, and tools label Dec 13, 2018
@pietroalbini
Copy link
Member

cc @rust-lang/docs, should this PR be backported to beta and stable (1.31.1)?

@Mark-Simulacrum Mark-Simulacrum added beta-accepted Accepted for backporting to the compiler in the beta channel. stable-accepted Accepted for backporting to the compiler in the stable channel. labels Dec 16, 2018
@pietroalbini pietroalbini removed the stable-nominated Nominated for backporting to the compiler in the stable channel. label Dec 17, 2018
@QuietMisdreavus
Copy link
Member

Based on the issues mentioned in the PR description, i think this should be backported. I know i've seen people get confused by them already.

@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Dec 17, 2018
bors added a commit that referenced this pull request Dec 18, 2018
[beta] Rollup backports

PRs accepted for backport:

* #56781: Update LLVM submodule
* #56615: Update the book to fix some edition-related bugs
* #56562: Update libc version required by rustc
* #56282: Fix #56237: normalize type before deferred sizedness checking.
* Release notes for Rust 1.31.1

Approved PRs targeting beta:

* #56819: [beta] rustdoc: fix line numbers display for [src] pages
* #56893: [beta] Revert "Update CI-clang to 7.0.0 for Linux dists."

r? @ghost
bors added a commit that referenced this pull request Dec 18, 2018
[stable] 1.31.1 point release

Rust 1.31.1 is scheduled to be released on Thursday 20th, with the following changes:

* #56562: Update libc version required by rustc *(different patch made by me)*
* #56615: Update the book to fix some edition-related bugs
* rls submodule update to [`b379ef7`](rust-lang/rls@b379ef7), including:
  * rust-lang/rls#1170: Fix for common infinte loop regression
  * rust-lang/rls#1171: Can't jump to std defs

r? @Mark-Simulacrum
cc @rust-lang/core @rust-lang/release
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-docs Area: Documentation for any part of the project, including the compiler, standard library, and tools beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. stable-accepted Accepted for backporting to the compiler in the stable channel.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants