user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update E0088 to new format, remove E0090

Browse source
This commit is contained in:
Yossi Konstantinovsky 2016-09-02 02:31:40 +02:00 • committed by Omer Sheikh
parent 87b76a521d
commit 96b549a2ee
2 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/librustc_typeck/check/mod.rs
View file

@ -4412,20 +4412,27 @@ 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;
span_err!(self.tcx.sess, span, E0088,
"too many lifetime parameters provided: \
expected {}, found {}",
count(lifetime_defs.len()),
count(lifetimes.len()));
} else if lifetimes.len() > 0 && lifetimes.len() < lifetime_defs.len() {
span_err!(self.tcx.sess, span, E0090,
"too few lifetime parameters provided: \
expected {}, found {}",
count(lifetime_defs.len()),
count(lifetimes.len()));
let span = lifetimes[..].into_iter().skip(1).map(|lft| lft.span)
.fold(lifetimes[0].span, |acc, n| Span {
expn_id: acc.expn_id,
lo: acc.lo,
hi: n.hi,
});
struct_span_err!(self.tcx.sess, span, E0088,
"too many lifetime parameters provided: \
expected {}, found {}",
count(lifetime_defs.len()),
count(lifetimes.len()))
.span_label(span, &format!("unexpected lifetime parameter{}",
match lifetimes.len() { 1 => "", _ => "s" }))
.emit();
}
// The case where there is not enough lifetime parameters is not checked,
// because this is not possible - a function never takes lifetime parameters.
// See discussion for Pull Request 36208.
// Check provided type parameters.
let type_defs = segment.map_or(&[][..], |(_, generics)| {
if generics.parent.is_none() {

5
src/test/compile-fail/E0088.rs
View file

@ -9,7 +9,12 @@
// except according to those terms.
fn f() {}
fn g<'a>() {}
fn main() {
f::<'static>(); //~ ERROR E0088
//~^ unexpected lifetime parameter
g::<'static, 'static>(); //~ ERROR E0088
//~^ unexpected lifetime parameters
}