Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove duplicated "parameter" in E0089 text
Closes #39732
  • Loading branch information
shepmaster committed Feb 13, 2017
1 parent 717ac96 commit 79d32e9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
7 changes: 2 additions & 5 deletions src/librustc_typeck/check/mod.rs
Expand Up @@ -4566,14 +4566,11 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
} else if !infer_types && types.len() < required_len {
let adjust = |len| if len > 1 { "parameters" } else { "parameter" };
let required_param_str = adjust(required_len);
let actual_param_str = adjust(types.len());
struct_span_err!(self.tcx.sess, span, E0089,
"too few type parameters provided: \
expected {} {}, found {} {}",
expected {}, found {}",
count(required_len),
required_param_str,
count(types.len()),
actual_param_str)
count(types.len()))
.span_label(span, &format!("expected {} type {}", required_len, required_param_str))
.emit();
}
Expand Down
5 changes: 2 additions & 3 deletions src/test/compile-fail/E0089.rs
Expand Up @@ -11,7 +11,6 @@
fn foo<T, U>() {}

fn main() {
foo::<f64>();
//~^ ERROR E0089
//~| NOTE expected 2 type parameters
foo::<f64>(); //~ ERROR expected 2 parameters, found 1 parameter [E0089]
//~| NOTE expected 2 type parameters
}

0 comments on commit 79d32e9

Please sign in to comment.