diff options
| author | bors <bors@rust-lang.org> | 2013-04-23 02:33:49 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-04-23 02:33:49 -0700 |
| commit | 0290caa885ec9bdd3a6d91cbbfbfbae4ed164fd6 (patch) | |
| tree | 8e665a31bd2f2a2d3b1c7eae3bb5356e2afec459 /src | |
| parent | 212256b1a0c8bbe1d442d98afbf891b9ea33f13f (diff) | |
| parent | ca73fbf72615575f106ee18160580711aca89d85 (diff) | |
| download | rust-0290caa885ec9bdd3a6d91cbbfbfbae4ed164fd6.tar.gz rust-0290caa885ec9bdd3a6d91cbbfbfbae4ed164fd6.zip | |
auto merge of #6026 : isanbard/rust/ca73fbf72615575f106ee18160580711aca89d85, r=catamorphism
When the number of parameters is 1, then 'parameter' should remain singular. Otherwise pluralize it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/middle/typeck/collect.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc/middle/typeck/collect.rs b/src/librustc/middle/typeck/collect.rs index 8356b06e8a6..398e0fd4ac7 100644 --- a/src/librustc/middle/typeck/collect.rs +++ b/src/librustc/middle/typeck/collect.rs @@ -503,10 +503,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; } |