about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-08-23 08:44:30 -0400
committerGitHub <noreply@github.com>2017-08-23 08:44:30 -0400
commit96efcdf0657004e48a279a469c42fe3097b2e8be (patch)
tree85c998b7c0ca6f5f97226790c95650e843566882 /src/libstd
parente9853c47585baadf411720394c34ede7a49e9839 (diff)
parent1d5ee636d7409164a8c5df0f20a2c508449c672a (diff)
downloadrust-96efcdf0657004e48a279a469c42fe3097b2e8be.tar.gz
rust-96efcdf0657004e48a279a469c42fe3097b2e8be.zip
Rollup merge of #44054 - frewsxcv:frewsxcv-libstd-thread-unwrap-or-else, r=sfackler
Thread spawning: don't run `min_stack` if the user has specified stack size.

None
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/thread/mod.rs2
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();