auto merge of #10509 : cmr/rust/trait_name, r=alexcrichton

Rebase + fix of #10118

src/test/compile-fail/trait-impl-different-num-params.rs

@@ -13,7 +13,7 @@ trait foo {
 }
 impl foo for int {
     fn bar(&self) -> int {
-        //~^ ERROR method `bar` has 0 parameter(s) but the trait has 1
+        //~^ ERROR method `bar` has 0 parameters but the declaration in trait `foo::bar` has 1
         *self
     }
 }