about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonathan Turner <jonathandturner@users.noreply.github.com>2016-09-16 09:29:48 -0700
committerGitHub <noreply@github.com>2016-09-16 09:29:48 -0700
commit390e8bd15d4a0adfaf5799a7a382bd55411864d4 (patch)
tree02186e4bd736dcce7e9e38340191921c74c959ba
parentff224e7d8d5de764f27ac2e4a5e9d03b04e6503c (diff)
parentffaebadc990579c8813b3c21b5cd05c6bfdc595a (diff)
downloadrust-390e8bd15d4a0adfaf5799a7a382bd55411864d4.tar.gz
rust-390e8bd15d4a0adfaf5799a7a382bd55411864d4.zip
Rollup merge of #36505 - nagisa:temp-stack-size, r=eddyb
Default RUST_MIN_STACK to 16MiB for now

Temporary(?) workaround to https://github.com/rust-lang/rust/issues/35408.

cc @nikomatsakis if you want to veto the idea.

r? @eddyb
-rw-r--r--src/librustc_driver/lib.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
index fbd48fc42c9..a18a754b184 100644
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -1054,7 +1054,8 @@ fn parse_crate_attrs<'a>(sess: &'a Session, input: &Input) -> PResult<'a, Vec<as
 /// The diagnostic emitter yielded to the procedure should be used for reporting
 /// errors of the compiler.
 pub fn monitor<F: FnOnce() + Send + 'static>(f: F) {
-    const STACK_SIZE: usize = 8 * 1024 * 1024; // 8MB
+    // Temporarily have stack size set to 16MB to deal with nom-using crates failing
+    const STACK_SIZE: usize = 16 * 1024 * 1024; // 16MB
 
     struct Sink(Arc<Mutex<Vec<u8>>>);
     impl Write for Sink {