---

yaml
---
r: 211901
b: refs/heads/auto
c: 037456a
h: refs/heads/master
i:
  211899: 928e56d
v: v3

Author: Nick Hamann

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: f1db9cd7c3f9612c4d5d594fd81bf4ca1e721540
+refs/heads/auto: 037456a593d282d039a4df0de3aebdd72157bb74
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc_typeck/collect.rs

@@ -752,7 +752,11 @@ fn convert_methods<'a,'tcx,'i,I>(ccx: &CrateCtxt<'a, 'tcx>,
     let mut seen_methods = FnvHashSet();
     for (sig, id, ident, vis, span) in methods {
         if !seen_methods.insert(ident.name) {
-            span_err!(tcx.sess, span, E0201, "duplicate associated function");
+            let fn_desc = match sig.explicit_self.node {
+                ast::SelfStatic => "associated function",
+                _               => "method",
+            };
+            span_err!(tcx.sess, span, E0201, "duplicate {}", fn_desc);
         }
 
         convert_method(ccx,

branches/auto/src/librustc_typeck/diagnostics.rs

@@ -901,7 +901,7 @@ trait Baz {
 impl Baz for Foo {
     fn baz(&self) -> bool { true }
 
-    // error: duplicate associated function
+    // error: duplicate method
     fn baz(&self) -> bool { self.0 > 5 }
 }
 ```

branches/auto/src/test/compile-fail/impl-duplicate-methods.rs

@@ -11,7 +11,7 @@
 struct Foo;
 impl Foo {
     fn orange(&self){}
-    fn orange(&self){}   //~ ERROR duplicate associated function
+    fn orange(&self){}   //~ ERROR duplicate method
 }
 
 fn main() {}

branches/auto/src/test/compile-fail/issue-8153.rs

@@ -18,7 +18,7 @@ trait Bar {
 
 impl Bar for Foo {
     fn bar(&self) -> isize {1}
-    fn bar(&self) -> isize {2} //~ ERROR duplicate associated function
+    fn bar(&self) -> isize {2} //~ ERROR duplicate method
 }
 
 fn main() {

branches/auto/src/test/compile-fail/method-macro-backtrace.rs

@@ -29,7 +29,7 @@ impl S {
 
     // Cause an error. It shouldn't have any macro backtrace frames.
     fn bar(&self) { }
-    fn bar(&self) { } //~ ERROR duplicate associated function
+    fn bar(&self) { } //~ ERROR duplicate method
 }
 
 fn main() { }