diff options
| author | bors <bors@rust-lang.org> | 2017-08-17 17:10:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-08-17 17:10:25 +0000 |
| commit | 59ccba995de202fb9d9a8d795d2770fb2d199db0 (patch) | |
| tree | c3fb8fc436dc758eb7b2d7c6ddf438225671c3c0 /src/libstd/thread | |
| parent | dd39ecf368a3cdb937e129f36a2a342d0c9358f0 (diff) | |
| parent | 235fb23e553db0af9ac6e7d134a9f5a35bdf6619 (diff) | |
| download | rust-59ccba995de202fb9d9a8d795d2770fb2d199db0.tar.gz rust-59ccba995de202fb9d9a8d795d2770fb2d199db0.zip | |
Auto merge of #43939 - frewsxcv:rollup, r=frewsxcv
Rollup of 9 pull requests - Successful merges: #43891, #43905, #43912, #43914, #43915, #43916, #43920, #43928, #43930 - Failed merges:
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index 3cd9cf7727c..83feb595bce 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -560,7 +560,7 @@ pub fn current() -> Thread { /// implementing low-level shared resources or synchronization primitives. /// /// However programmers will usually prefer to use, [`channel`]s, [`Condvar`]s, -/// [`Mutex`]es or [`join`] for their synchronisation routines, as they avoid +/// [`Mutex`]es or [`join`] for their synchronization routines, as they avoid /// thinking about thread scheduling. /// /// Note that [`channel`]s for example are implemented using this primitive. |