From 79d32e99481c1eb77f84edc21825aa608fa7ca8a Mon Sep 17 00:00:00 2001
From: Jake Goulding <jake.goulding@gmail.com>
Date: Fri, 10 Feb 2017 21:09:54 -0500
Subject: [PATCH] Remove duplicated "parameter" in E0089 text

Closes #39732
---
 src/librustc_typeck/check/mod.rs | 7 ++-----
 src/test/compile-fail/E0089.rs   | 5 ++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index 8329d3eeed9e5..fd8bd37e4781c 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -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();
         }
diff --git a/src/test/compile-fail/E0089.rs b/src/test/compile-fail/E0089.rs
index 9ce36523709e5..b767f129b727c 100644
--- a/src/test/compile-fail/E0089.rs
+++ b/src/test/compile-fail/E0089.rs
@@ -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
 }