Skip to content

Commit 837d192

Browse files
committed
---
yaml --- r: 50393 b: refs/heads/auto c: 0189ef3 h: refs/heads/master i: 50391: 455f7a1 v: v3
1 parent 337d9f0 commit 837d192

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: f78af18127e2bc0075479e8495bfa63807e938fc
17+
refs/heads/auto: 0189ef360092dbebfef5bdfd7a2ebe0c0ccc0f3c
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

branches/auto/doc/tutorial.md

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,10 +1173,7 @@ For a more in-depth explanation of borrowed pointers, read the
11731173
## Freezing
11741174
11751175
Borrowing an immutable pointer to an object freezes it and prevents mutation.
1176-
`Owned` objects have freezing enforced statically at compile-time. Mutable
1177-
managed boxes handle freezing dynamically when any of their contents are
1178-
borrowed, and the task will fail if an attempt to modify them is made while
1179-
they are frozen.
1176+
`Owned` objects have freezing enforced statically at compile-time.
11801177
11811178
~~~~
11821179
let mut x = 5;
@@ -1186,6 +1183,20 @@ let mut x = 5;
11861183
// x is now unfrozen again
11871184
~~~~
11881185
1186+
Mutable managed boxes handle freezing dynamically when any of their contents
1187+
are borrowed, and the task will fail if an attempt to modify them is made while
1188+
they are frozen:
1189+
1190+
~~~~
1191+
let x = @mut 5;
1192+
let y = x;
1193+
{
1194+
let y = &*y; // the managed box is now frozen
1195+
// modifying it through x or y will cause a task failure
1196+
}
1197+
// the box is now unfrozen again
1198+
~~~~
1199+
11891200
# Dereferencing pointers
11901201
11911202
Rust uses the unary star operator (`*`) to access the contents of a

0 commit comments

Comments
 (0)