diff options
| author | bors <bors@rust-lang.org> | 2018-12-04 23:40:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-04 23:40:06 +0000 |
| commit | abe02cefd6cd1916df62ad7dc80161bea50b72e8 (patch) | |
| tree | f0da4847d4839eb456ac3cd57204d5a756de44ef /src/librustc_driver/lib.rs | |
| parent | bdb3f532d7a393b1da512dbc1bed65c9eb63846e (diff) | |
| parent | 6d54f6d6b1181e6fa7c5934ea3b4d6bfd1775512 (diff) | |
| download | rust-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/librustc_driver/lib.rs')
| -rw-r--r-- | src/librustc_driver/lib.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs index 276b7290c2e..9a0d461444c 100644 --- a/src/librustc_driver/lib.rs +++ b/src/librustc_driver/lib.rs @@ -1460,6 +1460,11 @@ fn parse_crate_attrs<'a>(sess: &'a Session, input: &Input) -> PResult<'a, Vec<as } } +// Temporarily have stack size set to 32MB to deal with various crates with long method +// chains or deep syntax trees. +// FIXME(oli-obk): get https://github.com/rust-lang/rust/pull/55617 the finish line +const STACK_SIZE: usize = 32 * 1024 * 1024; // 32MB + /// Runs `f` in a suitable thread for running `rustc`; returns a `Result` with either the return /// value of `f` or -- if a panic occurs -- the panic value. /// @@ -1469,9 +1474,6 @@ pub fn in_named_rustc_thread<F, R>(name: String, f: F) -> Result<R, Box<dyn Any where F: FnOnce() -> R + Send + 'static, R: Send + 'static, { - // Temporarily have stack size set to 16MB to deal with nom-using crates failing - const STACK_SIZE: usize = 16 * 1024 * 1024; // 16MB - #[cfg(all(unix, not(target_os = "haiku")))] let spawn_thread = unsafe { // Fetch the current resource limits |