---

yaml
---
r: 33087
b: refs/heads/dist-snap
c: 8cb3da5
h: refs/heads/master
i:
  33085: f871450
  33083: e460b14
  33079: b588583
  33071: be46dd8
  33055: 444dc0d
  33023: c83ac6b
v: v3

Author: brson

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: fafce9ae37128f14c890b0805b410527ab81472f
+refs/heads/dist-snap: 8cb3da576deb06a7c298761c01708ea90b18659b
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/doc/tutorial.md

@@ -872,17 +872,6 @@ is optionally followed by an expression to return. A function can
 also return a value by having its top level block produce an
 expression.
 
-~~~~
-# const copernicus: int = 0;
-fn int_to_str(i: int) -> ~str {
-    if i == copernicus {
-        return ~"tube sock";
-    } else {
-        return ~"violin";
-    }
-}
-~~~~
-
 ~~~~
 fn line(a: int, b: int, x: int) -> int {
     a*x + b
@@ -1122,7 +1111,7 @@ let x = ~10;
 let y = copy x;
 
 let z = *x + *y;
-assert z = 20;
+assert z == 20;
 ~~~~
 
 This is where the 'move' operator comes in. It is similar to
@@ -1131,7 +1120,7 @@ from `x` to `y`, without violating the constraint that it only has a
 single owner (if you used assignment instead of the move operator, the
 box would, in principle, be copied).
 
-~~~~ {.ignore}
+~~~~ {.xfail-test}
 let x = ~10;
 let y = move x;
 
@@ -1273,7 +1262,7 @@ also done with square brackets (zero-based):
 #               BananaMania, Beaver, Bittersweet };
 # fn draw_scene(c: Crayon) { }
 
-let crayons: [Crayon] = [BananaMania, Beaver, Bittersweet];
+let crayons: [Crayon * 3] = [BananaMania, Beaver, Bittersweet];
 match crayons[0] {
     Bittersweet => draw_scene(crayons[0]),
     _ => ()
@@ -1290,7 +1279,7 @@ elements. Mutable vector literals are written `[mut]` (empty) or `[mut
 #               Aquamarine, Asparagus, AtomicTangerine,
 #               BananaMania, Beaver, Bittersweet };
 
-let crayons: [mut Crayon] = [mut BananaMania, Beaver, Bittersweet];
+let crayons: [mut Crayon * 3] = [mut BananaMania, Beaver, Bittersweet];
 crayons[0] = AtomicTangerine;
 ~~~~
 
@@ -1330,7 +1319,8 @@ Strings are implemented with vectors of `[u8]`, though they have a distinct
 type. They support most of the same allocation options as
 vectors, though the string literal without a storage sigil, e.g.
 `"foo"` is treated differently than a comparable vector (`[foo]`).
-Where
+Wheras plain vectors are stack-allocated fixed length vectors,
+plain strings are region pointers to read-only memory.
 
 ~~~
 // A plain string is a slice to read-only (static) memory