about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-03-22 01:36:33 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-03-23 04:54:27 +0530
commit5b9e87b5711361cb01bf3e066bc53c765f6dc5b9 (patch)
treecf60bf8a81163a4ff883b3c1692a2b954d24de5d /src/libstd/sync
parentf5782faa0667c0ee64eba8b5d49fc7d94358601e (diff)
parent84b14c5dc9bceeadb24beaa5ae1b126701b7d932 (diff)
downloadrust-5b9e87b5711361cb01bf3e066bc53c765f6dc5b9.tar.gz
rust-5b9e87b5711361cb01bf3e066bc53c765f6dc5b9.zip
Rollup merge of #23576 - barosl:mutex-doc, r=alexcrichton
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/mutex.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs
index 1cbfbbf2927..130fd1d7dc8 100644
--- a/src/libstd/sync/mutex.rs
+++ b/src/libstd/sync/mutex.rs
@@ -40,7 +40,7 @@ use fmt;
 /// among threads to ensure that a possibly invalid invariant is not witnessed.
 ///
 /// A poisoned mutex, however, does not prevent all access to the underlying
-/// data. The `PoisonError` type has an `into_guard` method which will return
+/// data. The `PoisonError` type has an `into_inner` method which will return
 /// the guard that would have otherwise been returned on a successful lock. This
 /// allows access to the data, despite the lock being poisoned.
 ///
@@ -105,7 +105,7 @@ use fmt;
 /// // pattern matched on to return the underlying guard on both branches.
 /// let mut guard = match lock.lock() {
 ///     Ok(guard) => guard,
-///     Err(poisoned) => poisoned.into_guard(),
+///     Err(poisoned) => poisoned.into_inner(),
 /// };
 ///
 /// *guard += 1;