Skip to content

Conversation

steveklabnik
Copy link
Member

This pulls in @gankro 's final nomicon changes, and adds the edition guide as a submodule.

This is the final doc backport to beta for 1.31, as well.

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

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

@rust-highfive
Copy link
Contributor

⚠️ 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 Nov 30, 2018
@steveklabnik steveklabnik added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 30, 2018
@Mark-Simulacrum Mark-Simulacrum added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 30, 2018
@Mark-Simulacrum
Copy link
Member

cc @rust-lang/release @pietroalbini -- can someone prepare the beta backport for this?

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented Nov 30, 2018

📌 Commit 934871a 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-review Status: Awaiting review from the assignee but also interested parties. labels Nov 30, 2018
@pietroalbini
Copy link
Member

I'll prepare the backport in a few hours max.

@steveklabnik
Copy link
Member Author

Let me know if you need any help!

@steveklabnik
Copy link
Member Author

I currently cannot build rust (see #56291 (comment)) and so I didn't run linkchecker yet; i'll be watching travis closely. sorry about that!

kennytm added a commit to kennytm/rust that referenced this pull request Nov 30, 2018
…imulacrum

Update books

This pulls in @gankro 's final nomicon changes, and adds the edition guide as a submodule.

This is the final doc backport to beta for 1.31, as well.
@steveklabnik
Copy link
Member Author

passed! woot!

@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 30, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Nov 30, 2018
…imulacrum

Update books

This pulls in @gankro 's final nomicon changes, and adds the edition guide as a submodule.

This is the final doc backport to beta for 1.31, as well.
bors added a commit that referenced this pull request Nov 30, 2018
Rollup of 19 pull requests

Successful merges:

 - #55011 (Add libstd Cargo feature "panic_immediate_abort")
 - #55821 (Use sort_by_cached_key when the key function is not trivial/free)
 - #56014 (add test for issue #21335)
 - #56131 (Assorted tweaks)
 - #56214 (Implement chalk unification routines)
 - #56216 (Add TryFrom<&[T]> for [T; $N] where T: Copy)
 - #56268 (Reuse the `P` in `InvocationCollector::fold_{,opt_}expr`.)
 - #56324 (Use raw_entry for more efficient interning)
 - #56336 (Clean up and streamline the pretty-printer)
 - #56337 (Fix const_fn ICE with non-const function pointer)
 - #56339 (Remove not used option)
 - #56341 (Rename conversion util; remove duplicate util in librustc_codegen_llvm.)
 - #56349 (rustc 1.30.0's linker flavor inference is a non-backwards compat change to -Clinker)
 - #56355 (Add inline attributes and add unit to CommonTypes)
 - #56360 (Optimize local linkchecker program)
 - #56364 (Fix panic with outlives in existential type)
 - #56365 (Stabilize self_struct_ctor feature.)
 - #56367 (Moved some feature gate tests to correct location)
 - #56373 (Update books)
@bors
Copy link
Collaborator

bors commented Nov 30, 2018

⌛ Testing commit 934871a with merge d09466c...

@bors bors merged commit 934871a into rust-lang:master Nov 30, 2018
bors added a commit that referenced this pull request Dec 1, 2018
[beta] Rollup backports

Approved for backport:

* #56373: Update books

r? @ghost
cc @Mark-Simulacrum @steveklabnik
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants