Skip to content

Commit ef2b1d8

Browse files
committed
---
yaml --- r: 275291 b: refs/heads/stable c: 2464013 h: refs/heads/master i: 275289: cfc5196 275287: 302e231
1 parent 122c69c commit ef2b1d8

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: 953f6c9cc9deceaabb71df8dcb879b104b0c8fb4
32+
refs/heads/stable: 246401367d373408922a6609b46cc56c60e0a795
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/doc/book/concurrency.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ thread::spawn(move || {
259259
```
260260

261261
First, we call `lock()`, which acquires the mutex's lock. Because this may fail,
262-
it returns a `Result<T, E>`, and because this is just an example, we `unwrap()`
262+
it returns an `Result<T, E>`, and because this is just an example, we `unwrap()`
263263
it to get a reference to the data. Real code would have more robust error handling
264264
here. We're then free to mutate it, since we have the lock.
265265

branches/stable/src/doc/reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4065,7 +4065,7 @@ the guarantee that these issues are never caused by safe code.
40654065
* Breaking the [pointer aliasing
40664066
rules](http://llvm.org/docs/LangRef.html#pointer-aliasing-rules)
40674067
with raw pointers (a subset of the rules used by C)
4068-
* `&mut` and `&` follow LLVM’s scoped [noalias] model, except if the `&T`
4068+
* `&mut T` and `&T` follow LLVM’s scoped [noalias] model, except if the `&T`
40694069
contains an `UnsafeCell<U>`. Unsafe code must not violate these aliasing
40704070
guarantees.
40714071
* Mutating non-mutable data (that is, data reached through a shared reference or

0 commit comments

Comments
 (0)