---

yaml
---
r: 51977
b: refs/heads/dist-snap
c: 82641d4
h: refs/heads/master
i:
  51975: 54ffe2c
v: v3

Author: auroranockert

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: d6faf23ca3295e4ec691aadc6e5c73f7f9848ae4
+refs/heads/dist-snap: 82641d4c39dd547c44c2d2ef4c0c98c5bfbd8b55
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/doc/rust.md

@@ -876,13 +876,6 @@ fn add(x: int, y: int) -> int {
 }
 ~~~~
 
-As with `let` bindings, function arguments are irrefutable patterns,
-so any pattern that is valid in a let binding is also valid as an argument.
-
-~~~
-fn first((value, _): (int, int)) -> int { value }
-~~~
-
 
 #### Generic functions
 
@@ -1229,44 +1222,17 @@ impl float: Num {
 let x: float = Num::from_int(42);     
 ~~~~
 
-Traits may inherit from other traits. For example, in
+Traits can have _constraints_ for example, in
 
 ~~~~
 trait Shape { fn area() -> float; }
 trait Circle : Shape { fn radius() -> float; }
 ~~~~
 
 the syntax `Circle : Shape` means that types that implement `Circle` must also have an implementation for `Shape`.
-Multiple supertraits are separated by spaces, `trait Circle : Shape Eq { }`.
 In an implementation of `Circle` for a given type `T`, methods can refer to `Shape` methods,
 since the typechecker checks that any type with an implementation of `Circle` also has an implementation of `Shape`.
 
-In type-parameterized functions,
-methods of the supertrait may be called on values of subtrait-bound type parameters.
-Refering to the previous example of `trait Circle : Shape`:
-
-~~~
-# trait Shape { fn area() -> float; }
-# trait Circle : Shape { fn radius() -> float; }
-fn radius_times_area<T: Circle>(c: T) -> float {
-    // `c` is both a Circle and a Shape
-    c.radius() * c.area()
-}
-~~~
-
-Likewise, supertrait methods may also be called on trait objects.
-
-~~~ {.xfail-test}
-# trait Shape { fn area() -> float; }
-# trait Circle : Shape { fn radius() -> float; }
-# impl int: Shape { fn area() -> float { 0.0 } }
-# impl int: Circle { fn radius() -> float { 0.0 } }
-# let mycircle = 0;
-
-let mycircle: Circle = @mycircle as @Circle;
-let nonsense = mycircle.radius() * mycircle.area();
-~~~
-
 ### Implementations
 
 An _implementation_ is an item that implements a [trait](#traits) for a specific type.
@@ -2879,16 +2845,6 @@ The kinds are:
     sendable kind are copyable, as are managed boxes, managed closures,
     trait types, and structural types built out of these.
     Types with destructors (types that implement `Drop`) can not implement `Copy`.
-`Drop`
-  : This is not strictly a kind, but its presence interacts with kinds: the `Drop`
-    trait provides a single method `finalize` that takes no parameters, and is run
-    when values of the type are dropped. Such a method is called a "destructor",
-    and are always executed in "top-down" order: a value is completely destroyed
-    before any of the values it owns run their destructors. Only `Owned` types
-    that do not implement `Copy` can implement `Drop`.
-
-> **Note:** The `finalize` method may be renamed in future versions of Rust.
-
 _Default_
   : Types with destructors, closure environments,
     and various other _non-first-class_ types,