diff options
| author | bors <bors@rust-lang.org> | 2020-01-31 03:10:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-31 03:10:07 +0000 |
| commit | 266ecd6625060af304adc01f38773c2f013de1c5 (patch) | |
| tree | fa1b45c467eea8918b50b0be085c677f8c66e1ab /src/libstd/sys | |
| parent | 138c50f0af57e2631aa09092b826e2c3efd224d2 (diff) | |
| parent | 6c67466f73b1727d148f48cb12d1c4d86fa392fc (diff) | |
| download | rust-266ecd6625060af304adc01f38773c2f013de1c5.tar.gz rust-266ecd6625060af304adc01f38773c2f013de1c5.zip | |
Auto merge of #68685 - Dylan-DPC:rollup-rkbo05z, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #68588 (check_unsafety: more code reuse) - #68638 (Add missing links for cmp traits) - #68660 (Fix typo.) - #68669 (suggest adding space in accidental doc comments) - #68670 (clarify "incorrect issue" error) - #68680 (Add `#![doc(html_playground_url = ...)]` to alloc crate) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/thread.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs index a5b34eeec28..3ca778354e4 100644 --- a/src/libstd/sys/unix/thread.rs +++ b/src/libstd/sys/unix/thread.rs @@ -426,8 +426,8 @@ pub mod guard { } // glibc >= 2.15 has a __pthread_get_minstack() function that returns -// PTHREAD_STACK_MIN plus however many bytes are needed for thread-local -// storage. We need that information to avoid blowing up when a small stack +// PTHREAD_STACK_MIN plus bytes needed for thread-local storage. +// We need that information to avoid blowing up when a small stack // is created in an application with big thread-local storage requirements. // See #6233 for rationale and details. #[cfg(target_os = "linux")] |