---

yaml
---
r: 31678
b: refs/heads/dist-snap
c: 5cb3a94
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 94aa38d470c713554a6973042f30fca0a5101a60
+refs/heads/dist-snap: 5cb3a94bfbafc6548b2dde42beddc903a97c9eb2
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/middle/resolve3.rs

@@ -847,7 +847,8 @@ class Resolver {
               // We don't want to complain if the multiple definitions
               // are in different namespaces. (unless it's the impl namespace,
               // since impls can share a name)
-              match ns.find(|n| n != ImplNS && child.defined_in_namespace(n)) {
+              match ns.find(|n| n != ImplNS
+                            && child.defined_in_namespace(n)) {
                 some(ns) => {
                   self.session.span_err(sp,
                        #fmt("Duplicate definition of %s %s",
@@ -3887,10 +3888,10 @@ class Resolver {
                     // The meaning of pat_ident with no type parameters
                     // depends on whether an enum variant with that name is in
                     // scope. The probing lookup has to be careful not to emit
-                    // spurious errors. Only matching patterns (match) can match
-                    // nullary variants. For binding patterns (let), matching
-                    // such a variant is simply disallowed (since it's rarely
-                    // what you want).
+                    // spurious errors. Only matching patterns (match) can
+                    // match nullary variants. For binding patterns (let),
+                    // matching such a variant is simply disallowed (since
+                    // it's rarely what you want).
 
                     let atom = (*self.atom_table).intern(path.idents[0]);