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

Auto merge of #127955 - chenyukang:yukang-fix-mismatched-delimiter-issue-12786, r=nnethercote

Browse Source 
Add limit for unclosed delimiters in lexer diagnostic

Fixes #127868

The first commit shows the original diagnostic, and the second commit shows the changes.
This commit is contained in:
bors 2024-07-30 13:02:16 +00:00
commit 595316b400
4 changed files with 55 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
compiler/rustc_parse/src/lexer/tokentrees.rs
View File

@ -73,16 +73,31 @@ fn lex_token_trees(
fn eof_err(&mut self) -> PErr<'psess> {
let msg = "this file contains an unclosed delimiter";
let mut err = self.string_reader.dcx().struct_span_err(self.token.span, msg);
for &(_, sp) in &self.diag_info.open_braces {
err.span_label(sp, "unclosed delimiter");
let unclosed_delimiter_show_limit = 5;
let len = usize::min(unclosed_delimiter_show_limit, self.diag_info.open_braces.len());
for &(_, span) in &self.diag_info.open_braces[..len] {
err.span_label(span, "unclosed delimiter");
self.diag_info.unmatched_delims.push(UnmatchedDelim {
found_delim: None,
found_span: self.token.span,
unclosed_span: Some(sp),
unclosed_span: Some(span),
candidate_span: None,
});
}
if let Some((_, span)) = self.diag_info.open_braces.get(unclosed_delimiter_show_limit)
&& self.diag_info.open_braces.len() >= unclosed_delimiter_show_limit + 2
{
err.span_label(
*span,
format!(
"another {} unclosed delimiters begin from here",
self.diag_info.open_braces.len() - unclosed_delimiter_show_limit
),
);
}
if let Some((delim, _)) = self.diag_info.open_braces.last() {
report_suspicious_mismatch_block(
&mut err,

8
tests/ui/parser/brace-in-let-chain.stderr
View File

@ -17,14 +17,8 @@ LL | fn qux() {
| - unclosed delimiter
...
LL | fn foo() {
| - unclosed delimiter
| - another 3 unclosed delimiters begin from here
...
LL | fn bar() {
| - unclosed delimiter
...
LL | fn baz() {
| - unclosed delimiter
LL | if false {
LL | {
| - this delimiter might not be properly closed...
LL | && let () = ()

6
tests/ui/parser/mismatched-delimiter-corner-case-issue-127868.rs Normal file
View File

@ -0,0 +1,6 @@
// issue: rust-lang/rust#127868
fn main() {
let a = [[[[[[[[[[[[[[[[[[[[1, {, (, [,;
} //~ ERROR mismatched closing delimiter: `}`
//~ ERROR this file contains an unclosed delimiter

30
tests/ui/parser/mismatched-delimiter-corner-case-issue-127868.stderr Normal file
View File

@ -0,0 +1,30 @@
error: mismatched closing delimiter: `}`
--> $DIR/mismatched-delimiter-corner-case-issue-127868.rs:4:42
|
LL | fn main() {
| - closing delimiter possibly meant for this
LL | let a = [[[[[[[[[[[[[[[[[[[[1, {, (, [,;
| ^ unclosed delimiter
LL | }
| ^ mismatched closing delimiter
error: this file contains an unclosed delimiter
--> $DIR/mismatched-delimiter-corner-case-issue-127868.rs:6:52
|
LL | fn main() {
| - unclosed delimiter
LL | let a = [[[[[[[[[[[[[[[[[[[[1, {, (, [,;
| ----- - this delimiter might not be properly closed...
| |||||
| ||||another 16 unclosed delimiters begin from here
| |||unclosed delimiter
| ||unclosed delimiter
| |unclosed delimiter
| unclosed delimiter
LL | }
| - ...as it matches this but it has different indentation
LL |
| ^
error: aborting due to 2 previous errors