Skip to content

Commit 0a7bd78

Browse files
committed
tutorial: Update for moves based on type
/cc: rust-lang#4217
1 parent d468893 commit 0a7bd78

File tree

1 file changed

+9
-19
lines changed

1 file changed

+9
-19
lines changed

doc/tutorial.md

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,13 +1124,16 @@ _exchange heap_, where their uniquely-owned nature allows tasks to
11241124
exchange them efficiently.
11251125

11261126
Because owned boxes are uniquely owned, copying them requires allocating
1127-
a new owned box and duplicating the contents. Copying owned boxes
1128-
is expensive so the compiler will complain if you do so without writing
1129-
the word `copy`.
1127+
a new owned box and duplicating the contents.
1128+
Instead, owned boxes are _moved_ by default, transferring ownership,
1129+
and deinitializing the previously owning variable.
1130+
Any attempt to access a variable after the value has been moved out
1131+
will result in a compile error.
11301132

11311133
~~~~
11321134
let x = ~10;
1133-
let y = x; // error: copying a non-implicitly copyable type
1135+
// Move x to y, deinitializing x
1136+
let y = x;
11341137
~~~~
11351138

11361139
If you really want to copy an owned box you must say so explicitly.
@@ -1143,19 +1146,6 @@ let z = *x + *y;
11431146
assert z == 20;
11441147
~~~~
11451148

1146-
This is where the 'move' operator comes in. It is similar to `copy`,
1147-
but it de-initializes its source. Thus, the owned box can move from
1148-
`x` to `y`, without violating the constraint that it only has a single
1149-
owner (using assignment instead of the move operator would, in
1150-
principle, copy the box).
1151-
1152-
~~~~ {.xfail-test}
1153-
let x = ~10;
1154-
let y = move x;
1155-
1156-
let z = *x + *y; // would cause an error: use of moved variable: `x`
1157-
~~~~
1158-
11591149
Owned boxes, when they do not contain any managed boxes, can be sent
11601150
to other tasks. The sending task will give up ownership of the box,
11611151
and won't be able to access it afterwards. The receiving task will
@@ -1360,7 +1350,7 @@ let your_crayons = ~[BananaMania, Beaver, Bittersweet];
13601350
let our_crayons = my_crayons + your_crayons;
13611351
13621352
// += will append to a vector, provided it lives in a mutable slot
1363-
let mut my_crayons = move my_crayons;
1353+
let mut my_crayons = my_crayons;
13641354
my_crayons += your_crayons;
13651355
~~~~
13661356
@@ -1899,7 +1889,7 @@ fn map<T, U>(vector: &[T], function: fn(v: &T) -> U) -> ~[U] {
18991889
for vec::each(vector) |element| {
19001890
accumulator.push(function(element));
19011891
}
1902-
return (move accumulator);
1892+
return accumulator;
19031893
}
19041894
~~~~
19051895

0 commit comments

Comments
 (0)