about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-04-26 09:04:27 -0700
committerbors <bors@rust-lang.org>2016-04-26 09:04:27 -0700
commit01a0207919a384b63fb23221d5e92e3e97a26e46 (patch)
tree737832302b6d1ba26c208eb4b7469592ee2e3996 /src/libstd/sync
parent092b0738b7f00740c997a3fb99dd0b8b50c4c157 (diff)
parent7609c645980eeb1feaea5e8122d29e9a6fc7ce5d (diff)
downloadrust-01a0207919a384b63fb23221d5e92e3e97a26e46.tar.gz
rust-01a0207919a384b63fb23221d5e92e3e97a26e46.zip
Auto merge of #33142 - tshepang:split-long-line, r=guillaumegomez
doc: that line was too long
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 21ce98f8748..90cc79dad66 100644
--- a/src/libstd/sync/mutex.rs
+++ b/src/libstd/sync/mutex.rs
@@ -206,8 +206,8 @@ impl<T: ?Sized> Mutex<T> {
     /// the guard goes out of scope, the mutex will be unlocked.
     ///
     /// The exact behavior on locking a mutex in the thread which already holds
-    /// the lock is left unspecified, however, this function will not return on
-    /// the second call, it might e.g. panic or deadlock.
+    /// the lock is left unspecified. However, this function will not return on
+    /// the second call (it might panic or deadlock, for example).
     ///
     /// # Errors
     ///