Skip to content

Commit

Permalink
Auto merge of #29805 - norcalli:patch-1, r=steveklabnik
Browse files Browse the repository at this point in the history
Fixes #29730
  • Loading branch information
bors committed Nov 16, 2015
2 parents 57c8a3e + 7b9b9df commit 3042fed
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/doc/trpl/references-and-borrowing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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.

0 comments on commit 3042fed

Please sign in to comment.