---

yaml
---
r: 36848
b: refs/heads/try2
c: f15ccc0
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 41870da5ad9d995d915ff24560ce269f8fa79690
+refs/heads/try2: f15ccc06f063c1c31c769650b8b73a0d0c452113
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/doc/tutorial.md

@@ -1124,13 +1124,16 @@ _exchange heap_, where their uniquely-owned nature allows tasks to
 exchange them efficiently.
 
 Because owned boxes are uniquely owned, copying them requires allocating
-a new owned box and duplicating the contents. Copying owned boxes
-is expensive so the compiler will complain if you do so without writing
-the word `copy`.
+a new owned box and duplicating the contents.
+Instead, owned boxes are _moved_ by default, transferring ownership,
+and deinitializing the previously owning variable.
+Any attempt to access a variable after the value has been moved out
+will result in a compile error.
 
 ~~~~
 let x = ~10;
-let y = x; // error: copying a non-implicitly copyable type
+// Move x to y, deinitializing x
+let y = x;
 ~~~~
 
 If you really want to copy an owned box you must say so explicitly.
@@ -1143,19 +1146,6 @@ let z = *x + *y;
 assert z == 20;
 ~~~~
 
-This is where the 'move' operator comes in. It is similar to `copy`,
-but it de-initializes its source. Thus, the owned box can move from
-`x` to `y`, without violating the constraint that it only has a single
-owner (using assignment instead of the move operator would, in
-principle, copy the box).
-
-~~~~ {.xfail-test}
-let x = ~10;
-let y = move x;
-
-let z = *x + *y; // would cause an error: use of moved variable: `x`
-~~~~
-
 Owned boxes, when they do not contain any managed boxes, can be sent
 to other tasks. The sending task will give up ownership of the box,
 and won't be able to access it afterwards. The receiving task will
@@ -1360,7 +1350,7 @@ let your_crayons = ~[BananaMania, Beaver, Bittersweet];
 let our_crayons = my_crayons + your_crayons;
 
 // += will append to a vector, provided it lives in a mutable slot
-let mut my_crayons = move my_crayons;
+let mut my_crayons = my_crayons;
 my_crayons += your_crayons;
 ~~~~
 
@@ -1899,7 +1889,7 @@ fn map<T, U>(vector: &[T], function: fn(v: &T) -> U) -> ~[U] {
     for vec::each(vector) |element| {
         accumulator.push(function(element));
     }
-    return (move accumulator);
+    return accumulator;
 }
 ~~~~