---

yaml
---
r: 39640
b: refs/heads/incoming
c: 4be7310
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 4b3dd4b9204171d0777749eaf1053fa240be24ec
+refs/heads/incoming: 4be7310be0a2f35a5a73825b0718aa643c740c8b
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/tutorial.md

@@ -733,22 +733,22 @@ fn point_from_direction(dir: Direction) -> Point {
 }
 ~~~~
 
-A special kind of enum variant, called _struct-like enums_,
-can have its fields extracted with dot notation and not just destructuring.
-For example:
+Enum variants may also be structs. For example:
 
 ~~~~
 # use core::float;
 # struct Point {x: float, y: float}
 # fn square(x: float) -> float { x * x }
 enum Shape {
     Circle { center: Point, radius: float },
-    Rectangle { left: Point, right: Point }
+    Rectangle { top_left: Point, bottom_right: Point }
 }
 fn area(sh: Shape) -> float {
    match sh {
-      Circle(c) => float::consts::pi * square(c.radius),
-      Rectangle(r) => r.right.x - r.left.x * r.right.y - r.right.y
+      Circle { radius: radius, _ } => float::consts::pi * square(radius),
+      Rectangle { top_left: top_left, bottom_right: bottom_right } => {
+        (bottom_right.x - top_left.x) * (bottom_right.y - top_left.y)
+      }
    }
 }
 ~~~~