Rollup merge of #69014 - dwrensha:fix-68890, r=Centril

change an instance of span_bug() to struct_span_err() to avoid ICE

After #67148, the `span_bug()` in `parse_ty_tuple_or_parens()` is reachable because `parse_paren_comma_seq()` can return an `Ok()` even in cases where it encounters an error.
This pull request prevents an ICE in such cases by replacing the `span_bug()` with `struct_span_error()`.

Fixes #68890.
This commit is contained in:
Dylan DPC 2020-02-10 17:29:03 +01:00 committed by GitHub
commit 119bc976db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 1 deletions

View File

@ -214,7 +214,10 @@ impl<'a> Parser<'a> {
let path = match bounds.remove(0) { let path = match bounds.remove(0) {
GenericBound::Trait(pt, ..) => pt.trait_ref.path, GenericBound::Trait(pt, ..) => pt.trait_ref.path,
GenericBound::Outlives(..) => { GenericBound::Outlives(..) => {
self.span_bug(ty.span, "unexpected lifetime bound") return Err(self.struct_span_err(
ty.span,
"expected trait bound, not lifetime bound",
));
} }
}; };
self.parse_remaining_bounds(Vec::new(), path, lo, true) self.parse_remaining_bounds(Vec::new(), path, lo, true)

View File

@ -0,0 +1,4 @@
enum e{A((?'a a+?+l))}
//~^ ERROR `?` may only modify trait bounds, not lifetime bounds
//~| ERROR expected one of `)`, `+`, or `,`
//~| ERROR expected trait bound, not lifetime bound

View File

@ -0,0 +1,20 @@
error: `?` may only modify trait bounds, not lifetime bounds
--> $DIR/issue-68890.rs:1:11
|
LL | enum e{A((?'a a+?+l))}
| ^
error: expected one of `)`, `+`, or `,`, found `a`
--> $DIR/issue-68890.rs:1:15
|
LL | enum e{A((?'a a+?+l))}
| ^ expected one of `)`, `+`, or `,`
error: expected trait bound, not lifetime bound
--> $DIR/issue-68890.rs:1:11
|
LL | enum e{A((?'a a+?+l))}
| ^^^
error: aborting due to 3 previous errors