diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-04-14 10:59:55 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-04-14 10:59:55 -0700 |
| commit | b9d9a376ea8843f46ccf9f043dbffa5ac2d1c073 (patch) | |
| tree | 94aa404c31d33f17e0fac67b1ea8e7e6a0b30946 /src/librustdoc | |
| parent | ae7959d298c95d5ffdeae8e7c3f3659d7fc28cdb (diff) | |
| parent | a9fd41e1f984fdfecb78ba9570bb159854c58b16 (diff) | |
| download | rust-b9d9a376ea8843f46ccf9f043dbffa5ac2d1c073.tar.gz rust-b9d9a376ea8843f46ccf9f043dbffa5ac2d1c073.zip | |
rollup merge of #24385: aturon/unstable-scoped
Conflicts: src/libstd/thread/mod.rs src/test/bench/shootout-mandelbrot.rs src/test/bench/shootout-reverse-complement.rs src/test/run-pass/capturing-logging.rs src/test/run-pass/issue-9396.rs src/test/run-pass/tcp-accept-stress.rs src/test/run-pass/tcp-connect-timeouts.rs src/test/run-pass/tempfile.rs
Diffstat (limited to 'src/librustdoc')
| -rw-r--r-- | src/librustdoc/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index bdee53cd009..1393c39f66c 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -130,10 +130,10 @@ struct Output { pub fn main() { const STACK_SIZE: usize = 32000000; // 32MB - let res = std::thread::Builder::new().stack_size(STACK_SIZE).scoped(move || { + let res = std::thread::Builder::new().stack_size(STACK_SIZE).spawn(move || { let s = env::args().collect::<Vec<_>>(); main_args(&s) - }).unwrap().join(); + }).unwrap().join().unwrap(); env::set_exit_status(res as i32); } |