auto merge of #13685 : Ryman/rust/issue7575, r=alexcrichton

Closes #7575.

I don't think the change from a contains lookup to an iteration of the HashSet in the resolver should be much of a burden as the set of methods with the same name should be relatively small.

src/test/compile-fail/issue-7575.rs

@@ -0,0 +1,80 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+trait CtxtFn {
+    fn f8(self, uint) -> uint;
+    fn f9(uint) -> uint; //~ NOTE candidate #
+}
+
+trait OtherTrait {
+    fn f9(uint) -> uint; //~ NOTE candidate #
+}
+
+trait UnusedTrait { // This should never show up as a candidate
+    fn f9(uint) -> uint;
+}
+
+impl CtxtFn for uint {
+    fn f8(self, i: uint) -> uint {
+        i * 4u
+    }
+
+    fn f9(i: uint) -> uint {
+        i * 4u
+    }
+}
+
+impl OtherTrait for uint {
+    fn f9(i: uint) -> uint {
+        i * 8u
+    }
+}
+
+struct MyInt(int);
+
+impl MyInt {
+    fn fff(i: int) -> int { //~ NOTE candidate #1 is `MyInt::fff`
+        i
+    }
+}
+
+trait ManyImplTrait {
+    fn is_str() -> bool { //~ NOTE candidate #1 is
+        false
+    }
+}
+
+impl ManyImplTrait for ~str {
+    fn is_str() -> bool {
+        true
+    }
+}
+
+impl ManyImplTrait for uint {}
+impl ManyImplTrait for int {}
+impl ManyImplTrait for char {}
+impl ManyImplTrait for MyInt {}
+
+fn no_param_bound(u: uint, m: MyInt) -> uint {
+    u.f8(42) + u.f9(342) + m.fff(42)
+            //~^ ERROR type `uint` does not implement any method in scope named `f9`
+            //~^^ NOTE found defined static methods, maybe a `self` is missing?
+                        //~^^^ ERROR type `MyInt` does not implement any method in scope named `fff`
+                        //~^^^^ NOTE found defined static methods, maybe a `self` is missing?
+}
+
+fn param_bound<T: ManyImplTrait>(t: T) -> bool {
+    t.is_str()
+    //~^ ERROR type `T` does not implement any method in scope named `is_str`
+    //~^^ NOTE found defined static methods, maybe a `self` is missing?
+}
+
+fn main() {
+}

src/test/run-pass/issue-7575.rs

@@ -0,0 +1,24 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+trait Foo {
+    fn new() -> bool { false }
+}
+
+trait Bar {
+    fn new(&self) -> bool { true }
+}
+
+impl Bar for int {}
+impl Foo for int {}
+
+fn main() {
+    assert!(1i.new());
+}