about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-03-09 00:08:03 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-03-09 00:08:03 +0530
commitd1ac69ce72ce964279de099b7887460f9c6a8024 (patch)
tree7c10c20b41e22965875dfa897345d44106810629
parentea8434f7eef703c34051ffad3b8842573a2dc63b (diff)
parente56fcbcd9959f3bbc0ff2c3f796dedc72c28c865 (diff)
Rollup merge of #23180 - steveklabnik:gh23052, r=alexcrichton
 Fixes #23052
-rw-r--r--src/doc/trpl/concurrency.md11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/doc/trpl/concurrency.md b/src/doc/trpl/concurrency.md
index 842957bd601..9b6d6ca67f6 100644
--- a/src/doc/trpl/concurrency.md
+++ b/src/doc/trpl/concurrency.md
@@ -223,15 +223,8 @@ method which has this signature:
 fn lock(&self) -> LockResult<MutexGuard<T>>
 ```
 
-If we [look at the code for MutexGuard](https://github.com/rust-lang/rust/blob/ca4b9674c26c1de07a2042cb68e6a062d7184cef/src/libstd/sync/mutex.rs#L172), we'll see
-this:
-
-```ignore
-__marker: marker::NoSend,
-```
-
-Because our guard is `NoSend`, it's not `Send`. Which means we can't actually
-transfer the guard across thread boundaries, which gives us our error.
+Because `Send` is not implemented for `MutexGuard<T>`, we can't transfer the
+guard across thread boundaries, which gives us our error.
 
 We can use `Arc<T>` to fix this. Here's the working version: