about summary refs log tree commit diff
path: root/src/libstd/sys/common/remutex.rs
diff options
context:
space:
mode:
authorSimonas Kazlauskas <git@kazlauskas.me>2015-08-12 15:39:49 +0300
committerSimonas Kazlauskas <git@kazlauskas.me>2015-08-12 17:00:58 +0300
commit646eace6ec5db397ba97e86df067792c0cb6be03 (patch)
tree7d2630d9d5a363b4336ce10d3779d6f5ba5403fb /src/libstd/sys/common/remutex.rs
parent2b45a0d90853deca584a28a55237d996a274a833 (diff)
downloadrust-646eace6ec5db397ba97e86df067792c0cb6be03.tar.gz
rust-646eace6ec5db397ba97e86df067792c0cb6be03.zip
Fix ReentrantMutex documentation wrt DerefMut
Initial version of PR had an DerefMut implementation, which was later removed
because it may cause mutable reference aliasing.

Suggest how to implement mutability with reentrant mutex and remove the claim we
implement DerefMut.
Diffstat (limited to 'src/libstd/sys/common/remutex.rs')
-rw-r--r--src/libstd/sys/common/remutex.rs13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/libstd/sys/common/remutex.rs b/src/libstd/sys/common/remutex.rs
index 8f416464173..0674618396f 100644
--- a/src/libstd/sys/common/remutex.rs
+++ b/src/libstd/sys/common/remutex.rs
@@ -36,11 +36,18 @@ unsafe impl<T: Send> Sync for ReentrantMutex<T> {}
 /// dropped (falls out of scope), the lock will be unlocked.
 ///
 /// The data protected by the mutex can be accessed through this guard via its
-/// Deref and DerefMut implementations
+/// Deref implementation.
+///
+/// # Mutability
+///
+/// Unlike `MutexGuard`, `ReentrantMutexGuard` does not implement `DerefMut`,
+/// because implementation of the trait would violate Rust’s reference aliasing
+/// rules. Use interior mutability (usually `RefCell`) in order to mutate the
+/// guarded data.
 #[must_use]
 pub struct ReentrantMutexGuard<'a, T: 'a> {
-    // funny underscores due to how Deref/DerefMut currently work (they
-    // disregard field privacy).
+    // funny underscores due to how Deref currently works (it disregards field
+    // privacy).
     __lock: &'a ReentrantMutex<T>,
     __poison: poison::Guard,
 }