Skip to content

Recover from parse error in tuple syntax - #59453

Merged
bors merged 4 commits into
rust-lang:masterfrom
estebank:recover-tuple-parse
Mar 30, 2019
Merged

Recover from parse error in tuple syntax#59453
bors merged 4 commits into
rust-lang:masterfrom
estebank:recover-tuple-parse

Conversation

@estebank

@estebankestebank commented Mar 27, 2019

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

rust-highfive commented Mar 27, 2019

Copy link
Copy Markdown
Contributor

r? @eddyb

(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 Mar 27, 2019
@estebank

estebank commented Mar 27, 2019

Copy link
Copy Markdown
ContributorAuthor

r? @petrochenkov

estebank
estebank commented Mar 27, 2019
View reviewed changes
Comment threadsrc/test/ui/issues/issue-34334.stderr Outdated

@estebankestebankMar 27, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an ICE regression test, so I'm disinclined to change it to avoid the new errors.

estebank
estebank commented Mar 27, 2019
View reviewed changes
Comment threadsrc/test/ui/parser/trait-object-lifetime-parens.stderr Outdated

@estebankestebankMar 27, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These new errors are unfortunate (caused by the changes in parse_bottom_expr) :-/

@estebank
estebankforce-pushed the recover-tuple-parse branch from 15ec821 to 5dd531eCompareMarch 27, 2019 01:16
@rust-highfive

This comment has been minimized.

Sign in to view
Centril
Centril reviewed Mar 27, 2019
View reviewed changes
Comment threadsrc/libsyntax/parse/parser.rs Outdated
Comment threadsrc/libsyntax/parse/parser.rs Outdated
petrochenkov
petrochenkov reviewed Mar 28, 2019
View reviewed changes
Comment threadsrc/test/ui/parser/pat-tuple-1.rs Outdated
@petrochenkov

petrochenkov commented Mar 28, 2019

Copy link
Copy Markdown
Contributor

r=me with @Centril's comments addressed or not
(I'm ok with trailing comments.)

@petrochenkovpetrochenkov 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 Mar 28, 2019
@estebank
estebankforce-pushed the recover-tuple-parse branch from 5dd531e to 9ea6790CompareMarch 29, 2019 02:58
Centril
Centril approved these changes Mar 29, 2019
View reviewed changes

@CentrilCentril left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pretty happy with the changes you made. Thanks! ❤️

Comment threadsrc/test/ui/parser/recover-from-bad-variant.stderr Outdated

@CentrilCentrilMar 29, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a follow up to this PR, could you point out the feature gate here?

@estebankestebankMay 29, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Centril, do we want to nudge people towards enabling type ascription, particularly when the most common case for this error is caused by incorrect syntax, not an attempt to use the nightly feature?

@CentrilCentrilMay 29, 2019•
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@estebank I don't think it wold be particularly invasive to point it out... It could be as simple as:

 = note: #![feature(type_ascription)] lets you annotate an expression with a type: `<expr>: <type>`

@estebankestebankMay 29, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#61325

@rust-highfive

This comment has been minimized.

Sign in to view
@petrochenkov

petrochenkov commented Mar 29, 2019

Copy link
Copy Markdown
Contributor

r=me with the failing test updated

@estebank
estebankforce-pushed the recover-tuple-parse branch from 1729d7a to 3592079CompareMarch 29, 2019 13:41
@estebank

estebank commented Mar 29, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors r=petrochenkov

@bors

bors commented Mar 29, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 3592079 has been approved by petrochenkov

@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 Mar 29, 2019
Centril added a commit to Centril/rust that referenced this pull request Mar 29, 2019
@Centril
Rollup merge ofrust-lang#59453- estebank:recover-tuple-parse, r=pet…
c07b227
…rochenkov
Recover from parse error in tuple syntax
@CentrilCentril mentioned this pull request Mar 29, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Mar 30, 2019
@Centril
Rollup merge ofrust-lang#59453- estebank:recover-tuple-parse, r=pet…
c28704c
…rochenkov
Recover from parse error in tuple syntax
@CentrilCentril mentioned this pull request Mar 30, 2019
Merged
bors added a commit that referenced this pull request Mar 30, 2019
@bors
Auto merge of#59550- Centril:rollup, r=Centril
6c49da4
Rollup of 10 pull requests
Successful merges:
- #59376 (RFC 2008: Enum Variants)
- #59453 (Recover from parse error in tuple syntax)
- #59455 (Account for short-hand field syntax when suggesting borrow)
- #59499 (Fix broken download link in the armhf-gnu image)
- #59512 (implement `AsRawFd` for stdio locks)
- #59525 (Whitelist some rustc attrs)
- #59528 (Improve the dbg! macro docs )
- #59532 (In doc examples, don't ignore read/write results)
- #59534 (rustdoc: collapse blanket impls in the same way as normal impls)
- #59537 (Fix OnceWith docstring.)
Failed merges:
r? @ghost
@bors
bors merged commit 3592079 into rust-lang:masterMar 30, 2019
@estebankestebank mentioned this pull request May 29, 2019
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkovpetrochenkovpetrochenkov left review comments
+1 more reviewer
@CentrilCentrilCentril approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@petrochenkovpetrochenkov

Labels

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.

6 participants

@estebank@rust-highfive@petrochenkov@bors@Centril@eddyb