Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Deduplicate mismatched delimiter errors #57944

Merged
merged 11 commits into from
Feb 9, 2019
Merged

Deduplicate mismatched delimiter errors #57944

merged 11 commits into from
Feb 9, 2019

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Jan 28, 2019 •
edited
Loading

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
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive rust-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
src/librustc_metadata/cstore_impl.rs Outdated Show resolved Hide resolved
src/libsyntax/parse/parser.rs Outdated Show resolved Hide resolved
src/libsyntax/parse/token.rs Outdated Show resolved Hide resolved
src/libsyntax/parse/token.rs Outdated Show resolved Hide resolved
src/libsyntax/parse/token.rs Outdated Show resolved Hide resolved
src/test/ui/resolve/token-error-correct.stderr Outdated Show resolved Hide resolved
src/libsyntax_ext/proc_macro_server.rs Outdated Show resolved Hide resolved
@rust-highfive

This comment has been minimized.

Sign in to view
@estebank estebank force-pushed the unclosed-delim-the-quickening branch from d31c1e1 to 0880f43 Compare February 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 estebank force-pushed the unclosed-delim-the-quickening branch from b26d032 to 40ad7c3 Compare February 5, 2019 11:22
@rust-highfive

This comment has been minimized.

Sign in to view
@estebank estebank force-pushed the unclosed-delim-the-quickening branch from 40ad7c3 to 8fbc738 Compare February 5, 2019 12:44
@estebank
Copy link
Contributor Author

estebank commented Feb 5, 2019

@varkor

@rust-highfive

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@estebank estebank force-pushed the unclosed-delim-the-quickening branch from f8926b2 to 6e62129 Compare February 7, 2019 09:57
@estebank
Copy link
Contributor Author

estebank commented Feb 7, 2019

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

@oli-obk
Copy link
Contributor

oli-obk commented Feb 7, 2019

@bors try

@bors
Copy link
Contributor

bors commented Feb 7, 2019

⌛ 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
Copy link
Contributor

oli-obk commented Feb 7, 2019

@rust-timer build dbcc2e8

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

@rust-timer
Copy link
Collaborator

Success: Queued dbcc2e8 with parent ad43389, comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit dbcc2e8

@estebank
Copy link
Contributor Author

estebank commented Feb 7, 2019

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

@bors
Copy link
Contributor

bors commented Feb 7, 2019

📌 Commit c54b230 has been approved by oli-obk

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

bors commented Feb 8, 2019

⌛ 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
Copy link
Contributor

bors commented Feb 8, 2019

💔 Test failed - checks-travis

@rust-highfive

This comment has been minimized.

Sign in to view
@bors bors 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
@kennytm kennytm 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
Copy link
Contributor Author

estebank commented Feb 8, 2019

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Feb 8, 2019

📌 Commit fb3c4fb has been approved by oli-obk

@bors 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 Feb 8, 2019
@bors
Copy link
Contributor

bors commented Feb 9, 2019

⌛ 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
Copy link
Contributor

bors commented Feb 9, 2019

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

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

@oli-obk oli-obk oli-obk left review comments

Assignees

@nikomatsakis nikomatsakis

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: 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