---

yaml
---
r: 22607
b: refs/heads/master
c: 135a8af
h: refs/heads/master
i:
  22605: c6ea222
  22603: 6e46ced
  22599: e002ac4
  22591: 0c4285a
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9c1dea5eb247c505ff050b6cf0aa13d260b872e5
+refs/heads/master: 135a8afd7b2e969bac352baa5fef377c5c90476f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/doc/rust.md

@@ -1350,20 +1350,13 @@ implemented. Implementation names do not conflict the way other names
 do: multiple implementations with the same name may exist in a scope at
 the same time.
 
-It is possible to define an implementation without referring to a trait.
-The methods in such an implementation can only be used
+It is possible to define an implementation without referring to a
+trait.  The methods in such an implementation can only be used
 statically (as direct calls on the values of the type that the
 implementation targets). In such an implementation, the `of` clause is
-not given, and the name is mandatory.
-
-~~~~
-impl uint_loops for uint {
-    fn times(f: fn(uint)) {
-        let mut i = 0u;
-        while i < self { f(i); i += 1u; }
-    }
-}
-~~~~
+not given, and the name is mandatory.  Such implementations are
+limited to nominal types (enums, classes) and the implementation must
+appear in the same module or a sub-module as the receiver type.
 
 _When_ a trait is specified, all methods declared as part of the
 trait must be present, with matching types and type parameter