about summary refs log tree commit diff
path: root/src/libstd/sys_common/poison.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-02-18 17:50:21 +0000
committerbors <bors@rust-lang.org>2018-02-18 17:50:21 +0000
commit27a046e9338fb0455c33b13e8fe28da78212dedc (patch)
tree004849f31563f7dd4c1eb9f54d12ad392887c077 /src/libstd/sys_common/poison.rs
parent1ad094d81c97b3d2dd8e980ccd1475a80647540d (diff)
parentcc20de3993bc47be613d20fdd4ec3c35cc410fcd (diff)
downloadrust-27a046e9338fb0455c33b13e8fe28da78212dedc.tar.gz
rust-27a046e9338fb0455c33b13e8fe28da78212dedc.zip
Auto merge of #48322 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 6 pull requests

- Successful merges: #48194, #48273, #48274, #48275, #48282, #48312
- Failed merges:
Diffstat (limited to 'src/libstd/sys_common/poison.rs')
-rw-r--r--src/libstd/sys_common/poison.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys_common/poison.rs b/src/libstd/sys_common/poison.rs
index 934ac3edbf1..e74c40ae04b 100644
--- a/src/libstd/sys_common/poison.rs
+++ b/src/libstd/sys_common/poison.rs
@@ -98,7 +98,7 @@ pub struct PoisonError<T> {
 }
 
 /// An enumeration of possible errors associated with a [`TryLockResult`] which
-/// can occur while trying to aquire a lock, from the [`try_lock`] method on a
+/// can occur while trying to acquire a lock, from the [`try_lock`] method on a
 /// [`Mutex`] or the [`try_read`] and [`try_write`] methods on an [`RwLock`].
 ///
 /// [`Mutex`]: struct.Mutex.html