---

yaml
---
r: 42079
b: refs/heads/master
c: 88bec09
h: refs/heads/master
i:
  42077: f8d2657
  42075: a73fd85
  42071: b451915
  42063: 504e43e
  42047: f810075
v: v3

Author: pnkfelix

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: bb51a8442fb16d71faccac1abfa953d8b1e37cb7
+refs/heads/master: 88bec09e6345d64d334c6dc1ef4947b35c467373
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/configure

@@ -516,7 +516,7 @@ then
                       | cut -d ' ' -f 2)
 
     case $CFG_CLANG_VERSION in
-        (3.0svn | 3.0 | 3.1* | 3.2* | 4.0* | 4.1*)
+        (3.0svn | 3.0 | 3.1 | 3.2 | 4.0 | 4.1)
         step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
         CFG_C_COMPILER="clang"
         ;;

trunk/doc/tutorial.md

@@ -2015,7 +2015,7 @@ the method name with the trait name.
 The compiler will use type inference to decide which implementation to call.
 
 ~~~~
-# trait Shape { static fn new(area: float) -> self; }
+trait Shape { static fn new(area: float) -> self; }
 # use float::consts::pi;
 # use float::sqrt;
 struct Circle { radius: float }
@@ -2211,11 +2211,16 @@ Likewise, supertrait methods may also be called on trait objects.
 ~~~ {.xfail-test}
 # trait Shape { fn area(&self) -> float; }
 # trait Circle : Shape { fn radius(&self) -> float; }
-# impl int: Shape { fn area(&self) -> float { 0.0 } }
-# impl int: Circle { fn radius(&self) -> float { 0.0 } }
-# let mycircle = 0;
+# use float::consts::pi;
+# use float::sqrt;
+# struct Point { x: float, y: float }
+# struct CircleStruct { center: Point, radius: float }
+# impl CircleStruct: Circle { fn radius(&self) -> float { sqrt(self.area() / pi) } }
+# impl CircleStruct: Shape { fn area(&self) -> float { pi * square(self.radius) } }
+
+let concrete = @CircleStruct{center:Point{x:3f,y:4f},radius:5f};
 
-let mycircle: Circle = @mycircle as @Circle;
+let mycircle: Circle = concrete as @Circle;
 let nonsense = mycircle.radius() * mycircle.area();
 ~~~