---

yaml
---
r: 35679
b: refs/heads/master
c: 82641d4
h: refs/heads/master
i:
  35677: 685bf3e
  35675: 876d62a
  35671: 24c4cd0
  35663: bd41d3f
  35647: 7d0c50b
v: v3

Author: auroranockert

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2fd8ebd03a9195bf7e2e3a811ec1dc0f1f2654db
+refs/heads/master: 82641d4c39dd547c44c2d2ef4c0c98c5bfbd8b55
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/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,