diff options
| author | bors <bors@rust-lang.org> | 2017-05-13 11:35:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-05-13 11:35:59 +0000 |
| commit | ef3ec5ece5bdf8950810225a9a3bc3cd1926e3d5 (patch) | |
| tree | 8948bc7cc6fbf6605069fa8e8d9774bc6eac8ab9 /src/libstd/thread/mod.rs | |
| parent | 453cad6e658e095c6beacf12c589609dac3f4e52 (diff) | |
| parent | f28e3cdf54b935d6284bd554e17dc8e44f7b4deb (diff) | |
| download | rust-ef3ec5ece5bdf8950810225a9a3bc3cd1926e3d5.tar.gz rust-ef3ec5ece5bdf8950810225a9a3bc3cd1926e3d5.zip | |
Auto merge of #41965 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 15 pull requests - Successful merges: #41820, #41860, #41876, #41896, #41912, #41916, #41918, #41921, #41923, #41934, #41935, #41940, #41942, #41943, #41951 - Failed merges:
Diffstat (limited to 'src/libstd/thread/mod.rs')
| -rw-r--r-- | src/libstd/thread/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index 230c60baf8b..200368be275 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -210,8 +210,8 @@ impl Builder { /// configuration methods can be chained. /// /// If the [`stack_size`] field is not specified, the stack size - /// will be the `RUST_MIN_STACK` environment variable, if it is - /// not specified either, a sensible default size will be set (2MB as + /// will be the `RUST_MIN_STACK` environment variable. If it is + /// not specified either, a sensible default will be set (2MB as /// of the writting of this doc). /// /// # Examples |