From 5ead9731737ecfbd19a80d9aac2d34d0ac95711c Mon Sep 17 00:00:00 2001
From: Jonathan Turner <jturner@mozilla.com>
Date: Fri, 6 Jan 2017 10:00:07 +1100
Subject: [PATCH 1/3] Add back in previous logic and remove span shrinking

---
 src/librustc_typeck/check/mod.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index ec1ca99c768..e1cfc64f3c7 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -4565,7 +4565,6 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
         // Check provided lifetime parameters.
         let lifetime_defs = segment.map_or(&[][..], |(_, generics)| &generics.regions);
         if lifetimes.len() > lifetime_defs.len() {
-            let span = lifetimes[lifetime_defs.len()].span;
             struct_span_err!(self.tcx.sess, span, E0088,
                              "too many lifetime parameters provided: \
                               expected {}, found {}",
@@ -4574,6 +4573,14 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
                 .span_label(span, &format!("unexpected lifetime parameter{}",
                                            match lifetimes.len() { 1 => "", _ => "s" }))
                 .emit();
+        } else if lifetimes.len() > 0 && lifetimes.len() < lifetime_defs.len() {
+            struct_span_err!(self.tcx.sess, span, E0090,
+                             "too few lifetime parameters provided: \
+                             expected {}, found {}",
+                             count(lifetime_defs.len()),
+                             count(lifetimes.len()))
+                .span_label(span, &format!("too few lifetime parameters"))
+                .emit();
         }
 
         // The case where there is not enough lifetime parameters is not checked,

From 069aa30445f52e111f888e1592e8a1d449c877d4 Mon Sep 17 00:00:00 2001
From: Jonathan Turner <jturner@mozilla.com>
Date: Fri, 6 Jan 2017 10:05:55 +1100
Subject: [PATCH 2/3] Add in test for E0090

---
 src/test/compile-fail/E0090.rs | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 src/test/compile-fail/E0090.rs

diff --git a/src/test/compile-fail/E0090.rs b/src/test/compile-fail/E0090.rs
new file mode 100644
index 00000000000..4656f527f1f
--- /dev/null
+++ b/src/test/compile-fail/E0090.rs
@@ -0,0 +1,5 @@
+fn foo<'a: 'b, 'b: 'a>() {}
+fn main() {
+    foo::<'static>();//~ ERROR E0090
+                     //~^ too few lifetime parameters
+}

From 33bb4715e767b64f140495b36b68d6729ef127e5 Mon Sep 17 00:00:00 2001
From: Jonathan Turner <jturner@mozilla.com>
Date: Fri, 6 Jan 2017 10:18:11 +1100
Subject: [PATCH 3/3] Fix tidy warning

---
 src/test/compile-fail/E0090.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/test/compile-fail/E0090.rs b/src/test/compile-fail/E0090.rs
index 4656f527f1f..4600d2d6385 100644
--- a/src/test/compile-fail/E0090.rs
+++ b/src/test/compile-fail/E0090.rs
@@ -1,3 +1,13 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 fn foo<'a: 'b, 'b: 'a>() {}
 fn main() {
     foo::<'static>();//~ ERROR E0090