---

yaml
---
r: 31074
b: refs/heads/incoming
c: 035cfcb
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: f96a2a2ca16a44f869336f7e28fc261551c1184c
+refs/heads/incoming: 035cfcbe7218018c1bab29a987ee1152ccd1dcf7
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/tutorial.md

@@ -2044,13 +2044,11 @@ However, consider this function:
 # type Circle = int; type Rectangle = int;
 # impl int: Drawable { fn draw() {} }
 # fn new_circle() -> int { 1 }
-
 trait Drawable { fn draw(); }
 
 fn draw_all<T: Drawable>(shapes: ~[T]) {
     for shapes.each |shape| { shape.draw(); }
 }
-
 # let c: Circle = new_circle();
 # draw_all(~[c]);
 ~~~~
@@ -2062,7 +2060,7 @@ needed, a trait name can alternately be used as a type.
 
 ~~~~
 # trait Drawable { fn draw(); }
-fn draw_all(shapes: ~[@Drawable]) {
+fn draw_all(shapes: &[@Drawable]) {
     for shapes.each |shape| { shape.draw(); }
 }
 ~~~~
@@ -2077,15 +2075,15 @@ to cast a value to a trait type:
 # trait Drawable { fn draw(); }
 # fn new_circle() -> Circle { 1 }
 # fn new_rectangle() -> Rectangle { true }
-# fn draw_all(shapes: ~[Drawable]) {}
+# fn draw_all(shapes: &[@Drawable]) {}
 
 impl @Circle: Drawable { fn draw() { ... } }
 
 impl @Rectangle: Drawable { fn draw() { ... } }
 
 let c: @Circle = @new_circle();
 let r: @Rectangle = @new_rectangle();
-draw_all(~[c as @Drawable, r as @Drawable]);
+draw_all(&[c as @Drawable, r as @Drawable]);
 ~~~~
 
 Note that, like strings and vectors, trait types have dynamic size
@@ -2130,10 +2128,9 @@ explicitly import it, you must refer to it by its long name,
 `farm::chicken`.
 
 ~~~~
-#[legacy_exports]
 mod farm {
-    fn chicken() -> ~str { ~"cluck cluck" }
-    fn cow() -> ~str { ~"mooo" }
+    pub fn chicken() -> ~str { ~"cluck cluck" }
+    pub fn cow() -> ~str { ~"mooo" }
 }
 fn main() {
     io::println(farm::chicken());