diff options
| author | bors <bors@rust-lang.org> | 2017-02-25 00:40:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-02-25 00:40:09 +0000 |
| commit | 7932349e95ebd9de314e5c5fce155c33940a148b (patch) | |
| tree | 2661207eb32ef57cfc5540ba31d5c3b8d5350881 /src/libstd/thread | |
| parent | 08230775a026c955873ba557e624b7f665661f37 (diff) | |
| parent | f26bbb351051b17fd2d32f19fb4964415fe1d07b (diff) | |
| download | rust-7932349e95ebd9de314e5c5fce155c33940a148b.tar.gz rust-7932349e95ebd9de314e5c5fce155c33940a148b.zip | |
Auto merge of #40072 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 11 pull requests - Successful merges: #39777, #39815, #39845, #39886, #39940, #40010, #40030, #40048, #40050, #40052, #40071 - Failed merges:
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/mod.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index 93e320c4522..2bc066d3fea 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -235,7 +235,7 @@ pub use self::local::{LocalKey, LocalKeyState}; pub struct Builder { // A name for the thread-to-be, for identification in panic messages name: Option<String>, - // The size of the stack for the spawned thread + // The size of the stack for the spawned thread in bytes stack_size: Option<usize>, } @@ -289,14 +289,17 @@ impl Builder { self } - /// Sets the size of the stack for the new thread. + /// Sets the size of the stack (in bytes) for the new thread. + /// + /// The actual stack size may be greater than this value if + /// the platform specifies minimal stack size. /// /// # Examples /// /// ``` /// use std::thread; /// - /// let builder = thread::Builder::new().stack_size(10); + /// let builder = thread::Builder::new().stack_size(32 * 1024); /// ``` #[stable(feature = "rust1", since = "1.0.0")] pub fn stack_size(mut self, size: usize) -> Builder { |
