Pluralise '1 type parameters' in errors

[Wilfred]

Given the code:

fn too_many_type_params() -> Option<i64, i64> {
    None
}

rustc reports:

error[E0244]: wrong number of type arguments
 --> <anon>:1:30
  |
1 | fn too_many_type_params() -> Option<i64, i64> {
  |                              ^^^^^^^^^^^^^^^^ expected 1 type arguments, found 2

Ideally error messages would use correct plurals, so 'expected 1 type argument, found 2' in this case.

[zackmdavis]

I guess I should start remembering to use "fixes" or "resolves" language so that GitHub can close these automatically.

[Wilfred]

Let me do the honours :)