diff options
| author | bors <bors@rust-lang.org> | 2017-08-23 13:46:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-08-23 13:46:14 +0000 |
| commit | 2bb8fca18215298487a8684a132da828fdb5a751 (patch) | |
| tree | 85c998b7c0ca6f5f97226790c95650e843566882 /src/libstd/thread | |
| parent | a3f0ee9a7b17d522bfc6385f841d040445730f28 (diff) | |
| parent | 96efcdf0657004e48a279a469c42fe3097b2e8be (diff) | |
| download | rust-2bb8fca18215298487a8684a132da828fdb5a751.tar.gz rust-2bb8fca18215298487a8684a132da828fdb5a751.zip | |
Auto merge of #44058 - frewsxcv:rollup, r=frewsxcv
Rollup of 8 pull requests - Successful merges: #43631, #43977, #43983, #44016, #44039, #44043, #44047, #44054 - Failed merges:
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index 83feb595bce..ee103c803f5 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -374,7 +374,7 @@ impl Builder { { let Builder { name, stack_size } = self; - let stack_size = stack_size.unwrap_or(util::min_stack()); + let stack_size = stack_size.unwrap_or_else(util::min_stack); let my_thread = Thread::new(name); let their_thread = my_thread.clone(); |