Skip to content

Commit 92abce2

Browse files
committed
Use span of first unexpected lifetime in E0088.
1 parent 96b549a commit 92abce2

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

src/librustc_typeck/check/mod.rs

+2-8
Original file line numberDiff line numberDiff line change
@@ -4412,13 +4412,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
44124412
// Check provided lifetime parameters.
44134413
let lifetime_defs = segment.map_or(&[][..], |(_, generics)| &generics.regions);
44144414
if lifetimes.len() > lifetime_defs.len() {
4415-
let span = lifetimes[..].into_iter().skip(1).map(|lft| lft.span)
4416-
.fold(lifetimes[0].span, |acc, n| Span {
4417-
expn_id: acc.expn_id,
4418-
lo: acc.lo,
4419-
hi: n.hi,
4420-
});
4421-
4415+
let span = lifetimes[lifetime_defs.len()].span;
44224416
struct_span_err!(self.tcx.sess, span, E0088,
44234417
"too many lifetime parameters provided: \
44244418
expected {}, found {}",
@@ -4430,7 +4424,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
44304424
}
44314425

44324426
// The case where there is not enough lifetime parameters is not checked,
4433-
// because this is not possible - a function never takes lifetime parameters.
4427+
// because this is not possible - a function never takes lifetime parameters.
44344428
// See discussion for Pull Request 36208.
44354429

44364430
// Check provided type parameters.

src/test/compile-fail/E0088.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fn g<'a>() {}
1414
fn main() {
1515
f::<'static>(); //~ ERROR E0088
1616
//~^ unexpected lifetime parameter
17-
17+
1818
g::<'static, 'static>(); //~ ERROR E0088
1919
//~^ unexpected lifetime parameters
2020
}

0 commit comments

Comments
 (0)