about summary refs log tree commit diff
path: root/src/libsync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-08-02 21:51:10 +0000
committerbors <bors@rust-lang.org>2014-08-02 21:51:10 +0000
commit756b7b23c43cff52b1e2a89fae341c0a7389ee09 (patch)
tree47aa392a3889484b574a73224b2c8bc57e652bbe /src/libsync
parent147d117cff53198f17989a34b92513c33e059544 (diff)
parentad06dfe496e4e1abbc65268a58275ca2b483def5 (diff)
downloadrust-756b7b23c43cff52b1e2a89fae341c0a7389ee09.tar.gz
rust-756b7b23c43cff52b1e2a89fae341c0a7389ee09.zip
auto merge of #16180 : jbcrail/rust/fix-comments, r=steveklabnik
Diffstat (limited to 'src/libsync')
-rw-r--r--src/libsync/lock.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsync/lock.rs b/src/libsync/lock.rs
index e8418f9668f..665cd48a278 100644
--- a/src/libsync/lock.rs
+++ b/src/libsync/lock.rs
@@ -223,7 +223,7 @@ impl<T: Send> Mutex<T> {
     pub fn lock<'a>(&'a self) -> MutexGuard<'a, T> {
         let guard = self.lock.lock();
 
-        // These two accesses are safe because we're guranteed at this point
+        // These two accesses are safe because we're guaranteed at this point
         // that we have exclusive access to this mutex. We are indeed able to
         // promote ourselves from &Mutex to `&mut T`
         let poison = unsafe { &mut *self.failed.get() };
@@ -326,7 +326,7 @@ impl<T: Send + Share> RWLock<T> {
     pub fn write<'a>(&'a self) -> RWLockWriteGuard<'a, T> {
         let guard = self.lock.write();
 
-        // These two accesses are safe because we're guranteed at this point
+        // These two accesses are safe because we're guaranteed at this point
         // that we have exclusive access to this rwlock. We are indeed able to
         // promote ourselves from &RWLock to `&mut T`
         let poison = unsafe { &mut *self.failed.get() };