Skip to content

Rollup of 14 pull requests #32351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 30 commits into from
Mar 19, 2016
Merged
Changes from 2 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
94ee40a
FreeBSD has already supported Cargo
tclfs Mar 15, 2016
178b280
syntax: impl ToTokens for P<ast::ImplItem>
richo Mar 15, 2016
6ed7846
Add comment about opt-in nature of compiletest note/help messages.
frewsxcv Mar 15, 2016
01d7609
docs: One typo
tclfs Mar 16, 2016
2910c00
Fix usability problem when browse document locally
bombless Mar 17, 2016
79244c3
`let` introduces a statement
tclfs Mar 17, 2016
a6e077e
documentation fix in RELEASES.md
benaryorg Mar 17, 2016
d7f80ca
rustbuild: Fix cross to netbsd from Linux
alexcrichton Mar 17, 2016
667d1c6
Minor phrasing adjustment
toddlucas Mar 18, 2016
74d00bd
Make AssertRecoverSafe's field public
sfackler Mar 18, 2016
fcaefcf
liveness: substitute bound regions with free ones before normalizing …
jonas-schievink Mar 18, 2016
9e1d659
Update LLVM to include a backport to restore AA performance
dotdash Mar 18, 2016
b3ade68
Add a since to deprecations
sfackler Mar 18, 2016
797d520
Fix tidy
sfackler Mar 18, 2016
2ab1f0a
Use explicit -march flags in the i586 mk file
petevine Mar 18, 2016
135d24d
Fix volatile stores of fat pointers
Amanieu Mar 19, 2016
8a13440
Rollup merge of #32265 - tclfs:patch-1, r=alexcrichton
eddyb Mar 19, 2016
8be1d7d
Rollup merge of #32269 - richo:impl-totokens-p-implitem, r=nikomatsakis
eddyb Mar 19, 2016
e28a1b6
Rollup merge of #32271 - frewsxcv:compiletest-ignored-help-note, r=ni…
eddyb Mar 19, 2016
33c28b4
Rollup merge of #32288 - tclfs:patch-2, r=apasel422
eddyb Mar 19, 2016
5a5b5f1
Rollup merge of #32308 - bombless:patch-2, r=alexcrichton
eddyb Mar 19, 2016
cb9b1b2
Rollup merge of #32316 - tclfs:patch-3, r=steveklabnik
eddyb Mar 19, 2016
472fe10
Rollup merge of #32319 - benaryorg:patch-3, r=alexcrichton
eddyb Mar 19, 2016
9413d90
Rollup merge of #32321 - alexcrichton:cross-to-netbsd, r=japaric
eddyb Mar 19, 2016
d5dceba
Rollup merge of #32327 - toddlucas:master, r=apasel422
eddyb Mar 19, 2016
b29e299
Rollup merge of #32329 - sfackler:assert-recover-safe-pub, r=aturon
eddyb Mar 19, 2016
34bd8f3
Rollup merge of #32332 - jonas-schievink:issue32323, r=arielb1
eddyb Mar 19, 2016
4a67405
Rollup merge of #32337 - dotdash:llvm-aa-perf, r=alexcrichton
eddyb Mar 19, 2016
835d2a9
Rollup merge of #32342 - petevine:patch-1, r=alexcrichton
eddyb Mar 19, 2016
5bf1e58
Rollup merge of #32347 - Amanieu:volatile_fat_ptr, r=eddyb
eddyb Mar 19, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/doc/book/references-and-borrowing.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ both at the same time:
* exactly one mutable reference (`&mut T`).


You may notice that this is very similar, though not exactly the same as,
to the definition of a data race:
You may notice that this is very similar to, though not exactly the same as,
the definition of a data race:

> There is a ‘data race’ when two or more pointers access the same memory
> location at the same time, where at least one of them is writing, and the
Expand Down