Skip to content

Commit 79d32e9

Browse files
committed
Remove duplicated "parameter" in E0089 text
Closes #39732
1 parent 717ac96 commit 79d32e9

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

src/librustc_typeck/check/mod.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4566,14 +4566,11 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
45664566
} else if !infer_types && types.len() < required_len {
45674567
let adjust = |len| if len > 1 { "parameters" } else { "parameter" };
45684568
let required_param_str = adjust(required_len);
4569-
let actual_param_str = adjust(types.len());
45704569
struct_span_err!(self.tcx.sess, span, E0089,
45714570
"too few type parameters provided: \
4572-
expected {} {}, found {} {}",
4571+
expected {}, found {}",
45734572
count(required_len),
4574-
required_param_str,
4575-
count(types.len()),
4576-
actual_param_str)
4573+
count(types.len()))
45774574
.span_label(span, &format!("expected {} type {}", required_len, required_param_str))
45784575
.emit();
45794576
}

src/test/compile-fail/E0089.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
fn foo<T, U>() {}
1212

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

0 commit comments

Comments
 (0)