about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-08-22 16:59:28 -0700
committerGitHub <noreply@github.com>2016-08-22 16:59:28 -0700
commitd0da7f6af9d8547376d9497042eb3f4e6013776d (patch)
tree07e2e49d871682a5ee73e2dfbc271de9ac02041a /src/libstd/sys
parent3c5a0fa45b5e2786b6e64e27f48cd129e7aefdbd (diff)
parent8ea29366597e1b4af9c215ce485df3b4a4a447de (diff)
downloadrust-d0da7f6af9d8547376d9497042eb3f4e6013776d.tar.gz
rust-d0da7f6af9d8547376d9497042eb3f4e6013776d.zip
Auto merge of #35908 - jonathandturner:rollup, r=jonathandturner
Rollup of 20 pull requests

- Successful merges: #35360, #35526, #35809, #35817, #35820, #35824, #35835, #35841, #35842, #35858, #35860, #35861, #35864, #35878, #35879, #35881, #35882, #35889, #35891, #35901
- Failed merges: #35395
Diffstat (limited to 'src/libstd/sys')
-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");