about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonathan Turner <jonathandturner@users.noreply.github.com>2016-08-22 15:34:20 -0700
committerGitHub <noreply@github.com>2016-08-22 15:34:20 -0700
commit7c2fba6d4d889691286474a18752c5e086356e74 (patch)
tree0a6342a2a55d0f13c504786916d48e42f917db45
parentcc51d1c21dfb2c9b1e418117070c79183819260d (diff)
parentf7961126b5310a25d595304c3534d789b2df9d64 (diff)
downloadrust-7c2fba6d4d889691286474a18752c5e086356e74.tar.gz
rust-7c2fba6d4d889691286474a18752c5e086356e74.zip
Rollup merge of #35842 - apasel422:typo, r=GuillaumeGomez
Fix typos in unix/rwlock.rs

r? @steveklabnik
-rw-r--r--src/libstd/sys/unix/rwlock.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/unix/rwlock.rs b/src/libstd/sys/unix/rwlock.rs
index 08aeb5fb8cc..c754d5b8359 100644
--- a/src/libstd/sys/unix/rwlock.rs
+++ b/src/libstd/sys/unix/rwlock.rs
@@ -45,10 +45,10 @@ impl RWLock {
         // We roughly maintain the deadlocking behavior by panicking to ensure
         // that this lock acquisition does not succeed.
         //
-        // We also check whether there this lock is already write locked. This
+        // We also check whether this lock is already write locked. This
         // is only possible if it was write locked by the current thread and
         // the implementation allows recursive locking. The POSIX standard
-        // doesn't require recursivly locking a rwlock to deadlock, but we can't
+        // doesn't require recursively locking a rwlock to deadlock, but we can't
         // allow that because it could lead to aliasing issues.
         if r == libc::EAGAIN {
             panic!("rwlock maximum reader count exceeded");