From ca73fbf72615575f106ee18160580711aca89d85 Mon Sep 17 00:00:00 2001
From: Bill Wendling <wendling@apple.com>
Date: Mon, 22 Apr 2013 22:08:09 -0700
Subject: [PATCH] Use correct grammar for error message.
When the number of parameters is 1, then 'parameter' should remain singular.
Otherwise pluralize it.
---
src/librustc/middle/typeck/collect.rs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/librustc/middle/typeck/collect.rs b/src/librustc/middle/typeck/collect.rs
index f1d743e79e5..772bb459806 100644
--- a/src/librustc/middle/typeck/collect.rs
+++ b/src/librustc/middle/typeck/collect.rs
@@ -403,10 +403,11 @@ pub fn compare_impl_method(tcx: ty::ctxt,
if vec::len(impl_m.fty.sig.inputs) != vec::len(trait_m.fty.sig.inputs) {
tcx.sess.span_err(
cm.span,
- fmt!("method `%s` has %u parameters \
+ fmt!("method `%s` has %u parameter%s \
but the trait has %u",
*tcx.sess.str_of(trait_m.ident),
vec::len(impl_m.fty.sig.inputs),
+ if vec::len(impl_m.fty.sig.inputs) == 1 { "" } else { "s" },
vec::len(trait_m.fty.sig.inputs)));
return;
}