mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shorten lines, fix build breakage

Browse Source
This commit is contained in:
Tim Chevalier 2012-08-06 17:33:23 -07:00
parent 94aa38d470
commit 5cb3a94bfb
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/rustc/middle/resolve3.rs
View File

@ -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]);