about summary refs log tree commit diff
path: root/src/rustc
diff options
context:
space:
mode:
authorTim Chevalier <chevalier@alum.wellesley.edu>2012-08-06 17:33:23 -0700
committerTim Chevalier <chevalier@alum.wellesley.edu>2012-08-06 17:33:23 -0700
commit5cb3a94bfbafc6548b2dde42beddc903a97c9eb2 (patch)
tree8874b816a8c6c0b28d764e9ec7135ecc51196333 /src/rustc
parent94aa38d470c713554a6973042f30fca0a5101a60 (diff)
downloadrust-5cb3a94bfbafc6548b2dde42beddc903a97c9eb2.tar.gz
rust-5cb3a94bfbafc6548b2dde42beddc903a97c9eb2.zip
Shorten lines, fix build breakage
Diffstat (limited to 'src/rustc')
-rw-r--r--src/rustc/middle/resolve3.rs11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/rustc/middle/resolve3.rs b/src/rustc/middle/resolve3.rs
index f5286758a02..f87385664cc 100644
--- a/src/rustc/middle/resolve3.rs
+++ b/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]);