about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorBarosl Lee <vcs@barosl.com>2015-03-21 14:38:23 +0900
committerBarosl Lee <vcs@barosl.com>2015-03-21 14:38:23 +0900
commit84b14c5dc9bceeadb24beaa5ae1b126701b7d932 (patch)
tree752c2cf189c8ef86d984178f8c8765d104fe7004 /src/libstd/sync
parente2fa53e593a854a609ae9efe5a1bbe15265f0a6f (diff)
downloadrust-84b14c5dc9bceeadb24beaa5ae1b126701b7d932.tar.gz
rust-84b14c5dc9bceeadb24beaa5ae1b126701b7d932.zip
Fix documentation for std::sync::mutex: into_guard -> into_inner
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;