Skip to content

Parse Ty? as Option<Ty> and provide structured suggestion #92746

New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Jan 16, 2022
Merged

Parse Ty? as Option<Ty> and provide structured suggestion #92746

merged 1 commit into from
Jan 16, 2022

Conversation

estebank
Copy link
Contributor

Swift has specific syntax that desugars to Option<T> similar to our
? operator, which means that people might try to use it in Rust. Parse
it and gracefully recover.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 10, 2022
@rust-highfive
Copy link
Contributor

r? @davidtwco

(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 10, 2022
PatchMixolydic
PatchMixolydic reviewed Jan 10, 2022
View reviewed changes
@camelid camelid added the A-suggestion-diagnostics Area: Suggestions generated by the compiler applied by `cargo fix` label Jan 10, 2022
@estebank estebank force-pushed the question-mark-in-type branch from 31447cc to 16ce938 Compare January 12, 2022 23:49
@estebank
Parse Ty? as Option<Ty> and provide structured suggestion
cfc0bd1 
Swift has specific syntax that desugars to `Option<T>` similar to our
`?` operator, which means that people might try to use it in Rust. Parse
it and gracefully recover.
@estebank estebank force-pushed the question-mark-in-type branch from 16ce938 to cfc0bd1 Compare January 14, 2022 00:07
davidtwco
davidtwco approved these changes Jan 16, 2022
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

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

Apologies for the delay in reviewing this. This looks great.

@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 16, 2022

📌 Commit cfc0bd1 has been approved by davidtwco

@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 Jan 16, 2022
@scottmcm
Copy link
Member

Nice touch! C# has the same, where int? is sugar for Nullable<int>.

@matthiaskrgr matthiaskrgr mentioned this pull request Jan 16, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 16, 2022
@bors
Auto merge of rust-lang#92970 - matthiaskrgr:rollup-tcx7cfb, r=matthi…
bd3cb52 
…askrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#92487 (Fix unclosed boxes in pretty printing of TraitAlias)
 - rust-lang#92581 (ARMv6K Horizon - Enable default libraries)
 - rust-lang#92619 (Add diagnostic items for macros)
 - rust-lang#92635 (rustdoc: Yet more intra-doc links cleanup)
 - rust-lang#92646 (feat: rustc_pass_by_value lint attribute)
 - rust-lang#92706 (Clarify explicitly that BTree{Map,Set} are ordered.)
 - rust-lang#92710 (Include Projections when elaborating TypeOutlives)
 - rust-lang#92746 (Parse `Ty?` as `Option<Ty>` and provide structured suggestion)
 - rust-lang#92792 (rustdoc: fix intra-link for generic trait impls)
 - rust-lang#92814 (remove unused FIXME)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9323a0d into rust-lang:master Jan 16, 2022
@rustbot rustbot added this to the 1.60.0 milestone Jan 16, 2022
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Mar 1, 2022
Closed
@Dylan-DPC Dylan-DPC mentioned this pull request Mar 3, 2022
Closed
estebank added a commit to estebank/rust that referenced this pull request Mar 4, 2022
@estebank
Do not recover from Ty? in macro parsing
004f2ed 
Follow up to rust-lang#92746. Address rust-lang#94510.
@estebank estebank mentioned this pull request Mar 4, 2022
Merged
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 4, 2022
@Dylan-DPC
Rollup merge of rust-lang#94593 - estebank:issue-94510, r=davidtwco
e3371f0 
Do not recover from `Ty?` in macro parsing

Follow up to rust-lang#92746. Address rust-lang#94510.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 4, 2022
@Dylan-DPC
Rollup merge of rust-lang#94593 - estebank:issue-94510, r=davidtwco
ecf45f9 
Do not recover from `Ty?` in macro parsing

Follow up to rust-lang#92746. Address rust-lang#94510.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 4, 2022
@Dylan-DPC
Rollup merge of rust-lang#94593 - estebank:issue-94510, r=davidtwco
cbe4c10 
Do not recover from `Ty?` in macro parsing

Follow up to rust-lang#92746. Address rust-lang#94510.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 4, 2022
@Dylan-DPC
Rollup merge of rust-lang#94593 - estebank:issue-94510, r=davidtwco
4ad9c05 
Do not recover from `Ty?` in macro parsing

Follow up to rust-lang#92746. Address rust-lang#94510.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 4, 2022
@Dylan-DPC
Rollup merge of rust-lang#94593 - estebank:issue-94510, r=davidtwco
4b0293b 
Do not recover from `Ty?` in macro parsing

Follow up to rust-lang#92746. Address rust-lang#94510.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 4, 2022
@Dylan-DPC
Rollup merge of rust-lang#94593 - estebank:issue-94510, r=davidtwco
3fe5163 
Do not recover from `Ty?` in macro parsing

Follow up to rust-lang#92746. Address rust-lang#94510.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 4, 2022
@Dylan-DPC
Rollup merge of rust-lang#94593 - estebank:issue-94510, r=davidtwco
6c11b5b 
Do not recover from `Ty?` in macro parsing

Follow up to rust-lang#92746. Address rust-lang#94510.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 4, 2022
@matthiaskrgr
Rollup merge of rust-lang#94593 - estebank:issue-94510, r=davidtwco
256d895 
Do not recover from `Ty?` in macro parsing

Follow up to rust-lang#92746. Address rust-lang#94510.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 4, 2022
@matthiaskrgr
Rollup merge of rust-lang#94593 - estebank:issue-94510, r=davidtwco
f9b4976 
Do not recover from `Ty?` in macro parsing

Follow up to rust-lang#92746. Address rust-lang#94510.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 4, 2022
@Dylan-DPC
Rollup merge of rust-lang#94593 - estebank:issue-94510, r=davidtwco
bfbb8bd 
Do not recover from `Ty?` in macro parsing

Follow up to rust-lang#92746. Address rust-lang#94510.
cuviper pushed a commit to cuviper/rust that referenced this pull request Mar 18, 2022
@estebank @cuviper
Do not recover from Ty? in macro parsing
8dad22d 
Follow up to rust-lang#92746. Address rust-lang#94510.

(cherry picked from commit 004f2ed)
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@PatchMixolydic PatchMixolydic PatchMixolydic left review comments

@camelid camelid camelid left review comments

@davidtwco davidtwco davidtwco approved these changes

Assignees

@davidtwco davidtwco

Labels
A-suggestion-diagnostics Area: Suggestions generated by the compiler applied by `cargo fix` S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.60.0
Development

Successfully merging this pull request may close these issues.
8 participants
@estebank @rust-highfive @davidtwco @bors @scottmcm @PatchMixolydic @camelid @rustbot