---

yaml
---
r: 93705
b: refs/heads/try
c: ab9e3a6
h: refs/heads/master
i:
  93703: 216fb7c
v: v3

Author: emberian

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: 51bdec18b085b338a18256ae06692e2d200abdf3
+refs/heads/try: ab9e3a6652a03d6e7d4b6b9c02228174cc5ddab0
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/middle/typeck/check/mod.rs

@@ -864,7 +864,7 @@ pub fn compare_impl_method(tcx: ty::ctxt,
         tcx.sess.span_err(
             impl_m_span,
             format!("method `{}` has {} parameter{} \
-                  but the trait method `{}` has {}",
+                  but the declaration in trait `{}` has {}",
                  tcx.sess.str_of(trait_m.ident),
                  impl_m.fty.sig.inputs.len(),
                  if impl_m.fty.sig.inputs.len() == 1 { "" } else { "s" },

branches/try/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 parameters but the trait method `foo::bar` has 1
+        //~^ ERROR method `bar` has 0 parameters but the declaration in trait `foo::bar` has 1
         *self
     }
 }