Add back in previous logic and remove span shrinking

diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index ec1ca99c7687f3af9c00aae4053c5e483643b5d2..e1cfc64f3c728dca26042de2fe77e8d9a45a9bbc 100644 (file)
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -4565,7 +4565,6 @@ fn check_path_parameter_count(&self,
         // 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 @@ fn check_path_parameter_count(&self,
                 .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,