diff options
| author | bors <bors@rust-lang.org> | 2017-03-19 17:44:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-03-19 17:44:02 +0000 |
| commit | 38c53f3c2d31e73404545114f0ef42d5711c6403 (patch) | |
| tree | 54cee6512393829c234980aefb0c90260747278e /src/libstd/sync | |
| parent | 9c15de4fd59bee290848b5443c7e194fd5afb02c (diff) | |
| parent | 94e346b7b79d37fea729fa68fc2838e90724cc3f (diff) | |
| download | rust-38c53f3c2d31e73404545114f0ef42d5711c6403.tar.gz rust-38c53f3c2d31e73404545114f0ef42d5711c6403.zip | |
Auto merge of #40651 - frewsxcv:rollup, r=frewsxcv
Rollup of 13 pull requests - Successful merges: #40441, #40445, #40562, #40564, #40583, #40588, #40589, #40590, #40603, #40611, #40621, #40646, #40648 - Failed merges:
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/mutex.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs index 48d8d34dbe0..d79be2944c9 100644 --- a/src/libstd/sync/mutex.rs +++ b/src/libstd/sync/mutex.rs @@ -132,7 +132,7 @@ unsafe impl<T: ?Sized + Send> Sync for Mutex<T> { } /// An RAII implementation of a "scoped lock" of a mutex. When this structure is /// dropped (falls out of scope), the lock will be unlocked. /// -/// The data protected by the mutex can be access through this guard via its +/// The data protected by the mutex can be accessed through this guard via its /// [`Deref`] and [`DerefMut`] implementations. /// /// This structure is created by the [`lock`] and [`try_lock`] methods on |
