Skip to content

Commit 90f3028

Browse files
committed
---
yaml --- r: 93026 b: refs/heads/auto c: 9b35ae7 h: refs/heads/master v: v3
1 parent 2757283 commit 90f3028

File tree

2 files changed

+5
-20
lines changed

2 files changed

+5
-20
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: c3694d732ef9ed641671fbf116d183e78dc4e90a
16+
refs/heads/auto: 9b35ae75d2e275e6dbc4b93061f7b16c4efb5b19
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/doc/tutorial.md

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1431,8 +1431,8 @@ For a more in-depth explanation of borrowed pointers, read the
14311431
## Freezing
14321432
14331433
Lending an immutable pointer to an object freezes it and prevents mutation.
1434-
`Freeze` objects have freezing enforced statically at compile-time. Examples
1435-
of non-`Freeze` types are `@mut` and [`RefCell<T>`][refcell].
1434+
`Freeze` objects have freezing enforced statically at compile-time. An example
1435+
of a non-`Freeze` type is [`RefCell<T>`][refcell].
14361436
14371437
~~~~
14381438
let mut x = 5;
@@ -1443,20 +1443,6 @@ let mut x = 5;
14431443
# x = 3;
14441444
~~~~
14451445
1446-
Mutable managed boxes handle freezing dynamically when any of their contents
1447-
are borrowed, and the task will fail if an attempt to modify them is made while
1448-
they are frozen:
1449-
1450-
~~~~
1451-
let x = @mut 5;
1452-
let y = x;
1453-
{
1454-
let z = &*y; // the managed box is now frozen
1455-
// modifying it through x or y will cause a task failure
1456-
}
1457-
// the box is now unfrozen again
1458-
~~~~
1459-
14601446
[refcell]: http://static.rust-lang.org/doc/master/std/cell/struct.RefCell.html
14611447
14621448
# Dereferencing pointers
@@ -1477,7 +1463,7 @@ assignments. Such an assignment modifies the value that the pointer
14771463
points to.
14781464
14791465
~~~
1480-
let managed = @mut 10;
1466+
let managed = @10;
14811467
let mut owned = ~20;
14821468

14831469
let mut value = 30;
@@ -2113,8 +2099,7 @@ unless they contain managed boxes, managed closures, or borrowed pointers.
21132099
21142100
* `Freeze` - Constant (immutable) types.
21152101
These are types that do not contain anything intrinsically mutable.
2116-
Intrinsically mutable values include `@mut`
2117-
and `Cell` in the standard library.
2102+
Intrinsically mutable values include `Cell` in the standard library.
21182103
21192104
* `'static` - Non-borrowed types.
21202105
These are types that do not contain any data whose lifetime is bound to

0 commit comments

Comments
 (0)