From 84b14c5dc9bceeadb24beaa5ae1b126701b7d932 Mon Sep 17 00:00:00 2001 From: Barosl Lee Date: Sat, 21 Mar 2015 14:38:23 +0900 Subject: [PATCH] Fix documentation for std::sync::mutex: into_guard -> into_inner --- src/libstd/sync/mutex.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs index 1cbfbbf29278f..130fd1d7dc83b 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;