Skip to content

Deduplicate mismatched delimiter errors - #57944

Merged
bors merged 11 commits into
rust-lang:masterfrom
estebank:unclosed-delim-the-quickening
Feb 9, 2019
Merged

Deduplicate mismatched delimiter errors#57944
bors merged 11 commits into
rust-lang:masterfrom
estebank:unclosed-delim-the-quickening

Conversation

@estebank

@estebankestebank commented Jan 28, 2019•
edited
Loading

Copy link
Copy Markdown
Contributor

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

rust-highfive commented Jan 28, 2019

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 28, 2019
estebank
estebank commented Jan 28, 2019
View reviewed changes
Comment threadsrc/librustc_metadata/cstore_impl.rs Outdated
Comment threadsrc/libsyntax/parse/parser.rs Outdated
Comment threadsrc/libsyntax/parse/token.rs Outdated
Comment threadsrc/libsyntax/parse/token.rs Outdated
Comment threadsrc/libsyntax/parse/token.rs Outdated
Comment threadsrc/test/ui/resolve/token-error-correct.stderr Outdated
Comment threadsrc/libsyntax_ext/proc_macro_server.rs Outdated
@rust-highfive

This comment has been minimized.

Sign in to view
@estebank
estebankforce-pushed the unclosed-delim-the-quickening branch from d31c1e1 to 0880f43CompareFebruary 5, 2019 09:46
@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
@estebank
estebankforce-pushed the unclosed-delim-the-quickening branch from b26d032 to 40ad7c3CompareFebruary 5, 2019 11:22
@rust-highfive

This comment has been minimized.

Sign in to view
@estebank
estebankforce-pushed the unclosed-delim-the-quickening branch from 40ad7c3 to 8fbc738CompareFebruary 5, 2019 12:44
@estebank

estebank commented Feb 5, 2019

Copy link
Copy Markdown
ContributorAuthor

@varkor

@rust-highfive

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@estebank
estebankforce-pushed the unclosed-delim-the-quickening branch from f8926b2 to 6e62129CompareFebruary 7, 2019 09:57
@estebank

estebank commented Feb 7, 2019

Copy link
Copy Markdown
ContributorAuthor

CC @davidtwco@zackmdavis@euclio@oli-obk who might have comments on the approach/idea/result.

oli-obk
oli-obk reviewed Feb 7, 2019
View reviewed changes
Comment threadsrc/libsyntax/parse/parser.rs Outdated
@oli-obk

oli-obk commented Feb 7, 2019

Copy link
Copy Markdown
Contributor

@bors try

@bors

bors commented Feb 7, 2019

Copy link
Copy Markdown
Collaborator

⌛ Trying commit c54b230 with merge dbcc2e8...

bors added a commit that referenced this pull request Feb 7, 2019
@bors
Auto merge of#57944- estebank:unclosed-delim-the-quickening, r=<try>
dbcc2e8
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.
@oli-obk

oli-obk commented Feb 7, 2019

Copy link
Copy Markdown
Contributor

@rust-timer build dbcc2e8

the last PR was a big perf hit, so let's check this before we merge

@rust-timer

rust-timer commented Feb 7, 2019

Copy link
Copy Markdown
Collaborator

Success: Queued dbcc2e8 with parent ad43389, comparison URL.

@rust-timer

rust-timer commented Feb 7, 2019

Copy link
Copy Markdown
Collaborator

Finished benchmarking try commit dbcc2e8

@estebank

estebank commented Feb 7, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors r=oli-obk as per our in person conversation.

@bors

bors commented Feb 7, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit c54b230 has been approved by oli-obk

@borsbors 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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 7, 2019
@estebankestebank mentioned this pull request Feb 8, 2019
Closed
@bors

bors commented Feb 8, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c54b230 with merge 8c2963b...

bors added a commit that referenced this pull request Feb 8, 2019
@bors
Auto merge of#57944- estebank:unclosed-delim-the-quickening, r=oli-obk
8c2963b
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.
@bors

bors commented Feb 8, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-travis

@rust-highfive

This comment has been minimized.

Sign in to view
@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 8, 2019
@kennytmkennytm 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 Feb 8, 2019
@estebank

estebank commented Feb 8, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors r=oli-obk

@bors

bors commented Feb 8, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit fb3c4fb has been approved by oli-obk

@borsbors 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 Feb 8, 2019
@bors

bors commented Feb 9, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit fb3c4fb with merge 3315728...

bors added a commit that referenced this pull request Feb 9, 2019
@bors
Auto merge of#57944- estebank:unclosed-delim-the-quickening, r=oli-obk
3315728
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.
@bors

bors commented Feb 9, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing 3315728 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Feb 9, 2019
@bors
bors merged commit fb3c4fb into rust-lang:masterFeb 9, 2019
This was referenced Feb 9, 2019
Merged
Closed
This was referenced Mar 3, 2019
Closed
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk left review comments

Assignees

@nikomatsakisnikomatsakis

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@estebank@rust-highfive@bors@oli-obk@rust-timer@kennytm@nikomatsakis