nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-31 14:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #108298 - TaKO8Ki:fix-104440, r=cjgillot

Browse Source 
Fix ICE: check if snippet is `)`

Fixes #107705
This commit is contained in:
Dylan DPC 2023-03-04 15:24:37 +05:30 committed by GitHub
commit 035aa2816a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/rustc_parse/src/parser/expr.rs
View File

@ -1210,8 +1210,13 @@ impl<'a> Parser<'a> {
// `Enum::Foo { a: 3, b: 4 }` or `Enum::Foo(3, 4)`.
self.restore_snapshot(snapshot);
let close_paren = self.prev_token.span;
let span = lo.to(self.prev_token.span);
if !fields.is_empty() {
let span = lo.to(close_paren);
if !fields.is_empty() &&
// `token.kind` should not be compared here.
// This is because the `snapshot.token.kind` is treated as the same as
// that of the open delim in `TokenTreesReader::parse_token_tree`, even if they are different.
self.span_to_snippet(close_paren).map_or(false, |snippet| snippet == ")")
{
let mut replacement_err = errors::ParenthesesWithStructFields {
span,
r#type: path,

3
tests/ui/parser/issue-107705.rs Normal file
View File

@ -0,0 +1,3 @@
// compile-flags: -C debug-assertions
fn f() {a(b:&, //~ ERROR this file contains an unclosed delimiter

10
tests/ui/parser/issue-107705.stderr Normal file
View File

@ -0,0 +1,10 @@
error: this file contains an unclosed delimiter
--> $DIR/issue-107705.rs:3:67
|
LL | fn f() {a(b:&,
| - - unclosed delimiter ^
| |
| unclosed delimiter
error: aborting due to previous error