Skip to content

Commit 5cb3a94

Browse files
committed
Shorten lines, fix build breakage
1 parent 94aa38d commit 5cb3a94

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/rustc/middle/resolve3.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,8 @@ class Resolver {
847847
// We don't want to complain if the multiple definitions
848848
// are in different namespaces. (unless it's the impl namespace,
849849
// since impls can share a name)
850-
match ns.find(|n| n != ImplNS && child.defined_in_namespace(n)) {
850+
match ns.find(|n| n != ImplNS
851+
&& child.defined_in_namespace(n)) {
851852
some(ns) => {
852853
self.session.span_err(sp,
853854
#fmt("Duplicate definition of %s %s",
@@ -3887,10 +3888,10 @@ class Resolver {
38873888
// The meaning of pat_ident with no type parameters
38883889
// depends on whether an enum variant with that name is in
38893890
// scope. The probing lookup has to be careful not to emit
3890-
// spurious errors. Only matching patterns (match) can match
3891-
// nullary variants. For binding patterns (let), matching
3892-
// such a variant is simply disallowed (since it's rarely
3893-
// what you want).
3891+
// spurious errors. Only matching patterns (match) can
3892+
// match nullary variants. For binding patterns (let),
3893+
// matching such a variant is simply disallowed (since
3894+
// it's rarely what you want).
38943895
38953896
let atom = (*self.atom_table).intern(path.idents[0]);
38963897

0 commit comments

Comments
 (0)