diff options
| author | bors <bors@rust-lang.org> | 2015-04-27 14:45:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-04-27 14:45:43 +0000 |
| commit | 32f9f4276271bac1b8c3bc569ceed5cfaf992f29 (patch) | |
| tree | ee1dacb85756e6fea3059a48f345317eb2986271 /src/libstd | |
| parent | b772ce6342962792620e21623997d0d3b98164b7 (diff) | |
| parent | 03f3b45ff0875926e245b1e6975d0578fd640468 (diff) | |
| download | rust-32f9f4276271bac1b8c3bc569ceed5cfaf992f29.tar.gz rust-32f9f4276271bac1b8c3bc569ceed5cfaf992f29.zip | |
Auto merge of #24869 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #24797, #24804, #24848, #24854, #24855, #24860, #24863, #24866, #24867, #24868 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/thread/mod.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index 9168a716d43..383726b3e83 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -115,8 +115,7 @@ //! ## Configuring threads //! //! A new thread can be configured before it is spawned via the `Builder` type, -//! which currently allows you to set the name, stack size, and writers for -//! `println!` and `panic!` for the child thread: +//! which currently allows you to set the name and stack size for the child thread: //! //! ```rust //! # #![allow(unused_must_use)] |