summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-04 23:40:06 +0000
committerbors <bors@rust-lang.org>2018-12-04 23:40:06 +0000
commitabe02cefd6cd1916df62ad7dc80161bea50b72e8 (patch)
treef0da4847d4839eb456ac3cd57204d5a756de44ef /src/bootstrap
parentbdb3f532d7a393b1da512dbc1bed65c9eb63846e (diff)
parent6d54f6d6b1181e6fa7c5934ea3b4d6bfd1775512 (diff)
downloadrust-1.31.0.tar.gz
rust-1.31.0.zip
Auto merge of #56518 - pietroalbini:stable-additions, r=pietroalbini 1.31.0
[stable] Add a few critical fixes to the 1.31.0 release

This PR cherry-picks the following PRs to stable:

* #56467: Bump stack size to 32MB
* #56486: Propagate all closure requirements to the caller
* #56519: update edition guide

The changes will be included in the final 1.31.0 binary (to avoid a point release). To deploy the build to dev-static the old manifest needs to be removed from the bucket after the PR is merged.

cc @rust-lang/core @rust-lang/release @rust-lang/compiler
r? @alexcrichton
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/builder.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index ab2c7c2325c..02e9ca92500 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -443,7 +443,8 @@ impl<'a> Builder<'a> {
                 doc::RustdocBook,
                 doc::RustByExample,
                 doc::RustcBook,
-                doc::CargoBook
+                doc::CargoBook,
+                doc::EditionGuide,
             ),
             Kind::Dist => describe!(
                 dist::Docs,