mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #122400 - wutchzone:122345, r=fmease

Browse Source 
Fix ICE in diagnostics for parenthesized type arguments

The second time is the charm 🤞 😁

Fixes #122345

r? fmease
This commit is contained in:
Matthias Krüger 2024-03-13 06:41:24 +01:00 committed by GitHub
commit 1ffa5ded58
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 54 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
compiler/rustc_parse/src/parser/path.rs
View File

@ -449,9 +449,13 @@ fn recover_fn_call_leading_path_sep(
prev_token_before_parsing: Token,
error: &mut Diag<'_>,
) {
if ((style == PathStyle::Expr && self.parse_paren_comma_seq(|p| p.parse_expr()).is_ok())
|| (style == PathStyle::Pat
&& self
match style {
PathStyle::Expr
if let Ok(_) = self
.parse_paren_comma_seq(|p| p.parse_expr())
.map_err(|error| error.cancel()) => {}
PathStyle::Pat
if let Ok(_) = self
.parse_paren_comma_seq(|p| {
p.parse_pat_allow_top_alt(
None,
@ -460,25 +464,31 @@ fn recover_fn_call_leading_path_sep(
CommaRecoveryMode::LikelyTuple,
)
})
.is_ok()))
&& !matches!(self.token.kind, token::ModSep | token::RArrow)
{
error.span_suggestion_verbose(
prev_token_before_parsing.span,
format!(
"consider removing the `::` here to {}",
match style {
PathStyle::Expr => "call the expression",
PathStyle::Pat => "turn this into a tuple struct pattern",
_ => {
return;
}
}
),
"",
Applicability::MaybeIncorrect,
);
.map_err(|error| error.cancel()) => {}
_ => {
return;
}
}
if let token::ModSep | token::RArrow = self.token.kind {
return;
}
error.span_suggestion_verbose(
prev_token_before_parsing.span,
format!(
"consider removing the `::` here to {}",
match style {
PathStyle::Expr => "call the expression",
PathStyle::Pat => "turn this into a tuple struct pattern",
_ => {
return;
}
}
),
"",
Applicability::MaybeIncorrect,
);
}
/// Parses generic args (within a path segment) with recovery for extra leading angle brackets.

7
tests/ui/parser/diagnostics-parenthesized-type-arguments-ice-issue-122345.rs Normal file
View File

@ -0,0 +1,7 @@
fn main() {
unsafe {
dealloc(ptr2, Layout::(x: !)(1, 1)); //~ ERROR: expected one of `!`, `(`, `)`, `+`, `,`, `::`, or `<`, found `:`
//~^ ERROR: expected one of `.`, `;`, `?`, `}`, or an operator, found `)`
//~| while parsing this parenthesized list of type arguments starting here
}
}

16
tests/ui/parser/diagnostics-parenthesized-type-arguments-ice-issue-122345.stderr Normal file
View File

@ -0,0 +1,16 @@
error: expected one of `!`, `(`, `)`, `+`, `,`, `::`, or `<`, found `:`
--> $DIR/diagnostics-parenthesized-type-arguments-ice-issue-122345.rs:3:33
|
LL | dealloc(ptr2, Layout::(x: !)(1, 1));
| --- ^ expected one of 7 possible tokens
| |
| while parsing this parenthesized list of type arguments starting here
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `)`
--> $DIR/diagnostics-parenthesized-type-arguments-ice-issue-122345.rs:3:43
|
LL | dealloc(ptr2, Layout::(x: !)(1, 1));
| ^ expected one of `.`, `;`, `?`, `}`, or an operator
error: aborting due to 2 previous errors