Improve messages for un-closed delimiter errors #53949

estebank · 2018-09-04T15:12:25Z

No description provided.

rust-highfive · 2018-09-04T15:12:36Z

(rust_highfive has picked a reviewer for you, use r? to override)

nikomatsakis

I'm very excited about this. Looks like tests don't quite pass yet, though.

I was wondering whether weirdness could happen because of macros, but I guess not: macro expansions can't introduce unpaired braces, after all. The error would occur when parsing the original file.

r=me once tests pass

nikomatsakis · 2018-09-04T17:45:10Z

src/test/ui/parser/unclosed-braces.stderr

+   |         - this might be the culprit...
+...
+LL |     }
+   |     - ...as it matches this but it has different indentation


nikomatsakis · 2018-09-04T17:46:33Z

src/libsyntax/parse/lexer/tokentrees.rs

+                        .next()  // these are in reverse order as they get inserted on close, but
+                    {            // we want the last open/first close
+                        if d == delim {
+                            err.span_label(*open_sp, "this might be the culprit...");


I love this language, but perhaps something a touch more formal...

"this delimiter might not be properly closed" ?

"this delimiter might be at fault" ?

* When encountering EOF, point at the last opening brace that does not have the same indentation level as its close delimiter. * When encountering the wrong type of close delimiter, point at the likely correct open delimiter to give a better idea of what went wrong.

estebank · 2018-09-05T14:13:41Z

I'm very excited about this. Looks like tests don't quite pass yet, though.

It was a parse-fail test with outdated wording. Fixed.

I was wondering whether weirdness could happen because of macros, but I guess not: macro expansions can't introduce unpaired braces, after all. The error would occur when parsing the original file.

The only thing that worries me is that code with wonky indentation will receive subpar suggestions, but I have banged my head trying to come up with better heuristics and they were all much more complicated than this for marginal benefit.

nikomatsakis · 2018-09-05T15:37:34Z

The only thing that worries me is that code with wonky indentation will receive subpar suggestions...

I feel like that's ok.

estebank · 2018-09-05T16:45:36Z

@bors r=nikomatsakis

bors · 2018-09-05T16:45:37Z

📌 Commit 3192d3d has been approved by nikomatsakis

…akis Improve messages for un-closed delimiter errors

bors · 2018-09-09T01:37:06Z

⌛ Testing commit 3192d3d with merge 004bc5a...

Improve messages for un-closed delimiter errors

bors · 2018-09-09T04:00:16Z

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 004bc5a to master...

nikomatsakis · 2018-09-09T14:18:22Z

Hmm, sadly, this PR seems to be a massive compilation time hit — I think we have to back it out :(

estebank · 2018-09-09T14:22:23Z

Wow, that's terrible. You can revert with my auto approval, as I'm laptop less until Monday. I'll take a look tonight to see if I can find any way to avoid this penalty.

Is there a way to run those performance tests locally?

@nikomatsakis

Don't compute padding of braces unless they are unmatched Follow up to #53949. Attempt to fix # #54083. r? @nikomatsakis

nnethercote · 2018-09-10T10:00:02Z

Benchmarking docs.

@nikomatsakis

Don't compute padding of braces unless they are unmatched Follow up to #53949. Attempt to fix # #54083. r? @nikomatsakis

Deduplicate mismatched delimiter errors Delay unmatched delimiter errors until after the parser has run to deduplicate them when parsing and attempt recovering intelligently. Second attempt at #54029, follow up to #53949. Fix #31528.

rust-highfive assigned nikomatsakis Sep 4, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 4, 2018

This comment has been minimized.

Sign in to view

estebank force-pushed the unclosed-delim branch from b56bd44 to 61d7db8 Compare September 4, 2018 16:17

This comment has been minimized.

Sign in to view

nikomatsakis approved these changes Sep 4, 2018

View reviewed changes

nikomatsakis added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 4, 2018

estebank added 3 commits September 5, 2018 03:43

Reword un-closed delimiter label

5238b52

Fix existing test

b2d2d83

estebank force-pushed the unclosed-delim branch from 61d7db8 to b2d2d83 Compare September 5, 2018 14:16

Change wording of unclosed delimiter label

3192d3d

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 5, 2018

estebank mentioned this pull request Sep 7, 2018

Try to recover from unmatched delimiters in the parser #54029

Closed

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Sep 8, 2018

Rollup merge of rust-lang#53949 - estebank:unclosed-delim, r=nikomats…

1e5e014

…akis Improve messages for un-closed delimiter errors

Mark-Simulacrum mentioned this pull request Sep 8, 2018

Rollup of 11 pull requests #54068

Closed

bors added a commit that referenced this pull request Sep 9, 2018

Auto merge of #53949 - estebank:unclosed-delim, r=nikomatsakis

004bc5a

Improve messages for un-closed delimiter errors

bors merged commit 3192d3d into rust-lang:master Sep 9, 2018

nikomatsakis mentioned this pull request Sep 9, 2018

compilation time hit from recent PR #54083

Closed

kennytm mentioned this pull request Sep 9, 2018

NLL: Deduplicate errors for incorrect move in loop #53995

Merged

estebank mentioned this pull request Sep 9, 2018

Don't compute padding of braces unless they are unmatched #54092

Merged

bors added a commit that referenced this pull request Sep 9, 2018

Auto merge of #54092 - estebank:gotta-go-fast, r=<try>

ff274ae

Don't compute padding of braces unless they are unmatched Follow up to #53949. Attempt to fix # #54083. r? @nikomatsakis

bors added a commit that referenced this pull request Sep 11, 2018

Auto merge of #54092 - estebank:gotta-go-fast, r=nikomatsakis

d6720cc

Don't compute padding of braces unless they are unmatched Follow up to #53949. Attempt to fix # #54083. r? @nikomatsakis

estebank mentioned this pull request Sep 14, 2018

idea: consult git diff for better diagnostics / syntax errors #48911

Closed

arielb1 mentioned this pull request Dec 15, 2018

Surprising error note "this delimiter might not be properly closed" #56834

Closed

estebank mentioned this pull request Jan 28, 2019

Deduplicate mismatched delimiter errors #57944

Merged

smmalis37 mentioned this pull request Apr 15, 2021

ICE: #[rustc_variance] on trait: asked to compute variance for wrong kind of item #79699

Closed

estebank deleted the unclosed-delim branch November 9, 2023 05:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve messages for un-closed delimiter errors #53949

Improve messages for un-closed delimiter errors #53949

estebank commented Sep 4, 2018

rust-highfive commented Sep 4, 2018

This comment has been minimized.

This comment has been minimized.

nikomatsakis left a comment

nikomatsakis Sep 4, 2018

nikomatsakis Sep 4, 2018

estebank commented Sep 5, 2018

nikomatsakis commented Sep 5, 2018

estebank commented Sep 5, 2018

bors commented Sep 5, 2018

bors commented Sep 9, 2018

bors commented Sep 9, 2018

nikomatsakis commented Sep 9, 2018

estebank commented Sep 9, 2018

nnethercote commented Sep 10, 2018

Improve messages for un-closed delimiter errors #53949

Improve messages for un-closed delimiter errors #53949

Conversation

estebank commented Sep 4, 2018

rust-highfive commented Sep 4, 2018

This comment has been minimized.

This comment has been minimized.

nikomatsakis left a comment

Choose a reason for hiding this comment

nikomatsakis Sep 4, 2018

Choose a reason for hiding this comment

nikomatsakis Sep 4, 2018

Choose a reason for hiding this comment

estebank commented Sep 5, 2018

nikomatsakis commented Sep 5, 2018

estebank commented Sep 5, 2018

bors commented Sep 5, 2018

bors commented Sep 9, 2018

bors commented Sep 9, 2018

nikomatsakis commented Sep 9, 2018

estebank commented Sep 9, 2018

nnethercote commented Sep 10, 2018