about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-11-16 17:18:21 +0000
committerbors <bors@rust-lang.org>2015-11-16 17:18:21 +0000
commit3042fedb4f50640e2c9a02297c5ce9a1f3ffaa5a (patch)
tree72f112e53956705530521f50eabb21a5ee669e0d
parent57c8a3e8b6a3200bb01d0ea60e4686a1ecfcb907 (diff)
parent7b9b9df309f4508cd81d50d443d8c74f30fcec30 (diff)
Auto merge of #29805 - norcalli:patch-1, r=steveklabnik
Fixes #29730
-rw-r--r--src/doc/trpl/references-and-borrowing.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/doc/trpl/references-and-borrowing.md b/src/doc/trpl/references-and-borrowing.md
index 944417d1096..d8758e0c695 100644
--- a/src/doc/trpl/references-and-borrowing.md
+++ b/src/doc/trpl/references-and-borrowing.md
@@ -171,9 +171,9 @@ to the definition of a data race:
 > operations are not synchronized.
 
 With references, you may have as many as you’d like, since none of them are
-writing. If you are writing, you need two or more pointers to the same memory,
-and you can only have one `&mut` at a time. This is how Rust prevents data
-races at compile time: we’ll get errors if we break the rules.
+writing. However, as we can only have one `&mut` at a time, it is impossible to
+have a data race. This is how Rust prevents data races at compile time: we’ll
+get errors if we break the rules.
 
 With this in mind, let’s consider our example again.
 
@@ -378,3 +378,4 @@ statement 1 at 3:14
 
 In the above example, `y` is declared before `x`, meaning that `y` lives longer
 than `x`, which is not allowed.
+