Skip to content

Suggest comma when writing println!("{}" a); - #52397

Merged
bors merged 3 commits into
rust-lang:masterfrom
estebank:println-comma
Aug 8, 2018
Merged

Suggest comma when writing println!("{}" a);#52397
bors merged 3 commits into
rust-lang:masterfrom
estebank:println-comma

Conversation

@estebank

@estebankestebank commented Jul 15, 2018

Copy link
Copy Markdown
Contributor

Fix#49370.

@estebankestebank changed the title Suggest comma when writing println!("{}" a);[WIP] Suggest comma when writing println!("{}" a);Jul 15, 2018
@rust-highfive

rust-highfive commented Jul 15, 2018

Copy link
Copy Markdown
Contributor

r? @pnkfelix

(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 Jul 15, 2018
@estebankestebank changed the title [WIP] Suggest comma when writing println!("{}" a);Suggest comma when writing println!("{}" a);Jul 15, 2018
oli-obk
oli-obk requested changes Jul 16, 2018
View reviewed changes
Comment threadsrc/libsyntax/tokenstream.rs Outdated

@oli-obkoli-obkJul 16, 2018

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.

ot -> to

Comment threadsrc/libsyntax/tokenstream.rs Outdated

@oli-obkoli-obkJul 16, 2018

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.

So this doesn't work for println!("{} {}" a, b); or println!("{} {}", a b);?

If it does work, please add tests, if it does not work, would it be a lot of effort to fix that?

@estebankestebankJul 16, 2018

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.

The further we go from the "{}" a case, the less likely we're to find a suitable fix by just checking against comma separated list. Having said that, making sure that every element is separated by commas should be easy to add.

@oli-obk

oli-obk commented Jul 16, 2018

Copy link
Copy Markdown
Contributor

r? @oli-obk

Advanced mode: Can we ask the macro matcher how far each arm got and suggest the next possible matches in the spirit of "expected one of foo, bar, boo, found a"?

@estebank

estebank commented Jul 16, 2018

Copy link
Copy Markdown
ContributorAuthor

Can we ask the macro matcher how far each arm got and suggest the next possible matches in the spirit of "expected one of foo, bar, boo, found a"?

@oli-obk that sounds interesting to do... I'll look into it this week.

@stokhosstokhos 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 Jul 21, 2018
@emilyalbini

emilyalbini commented Jul 30, 2018

Copy link
Copy Markdown
Member

Ping from triage @estebank! It's been a while since we heard from you, will you have time to work on this again?

@estebank

estebank commented Jul 30, 2018

Copy link
Copy Markdown
ContributorAuthor

@pietroalbini will do soonish.

@oli-obk I tried to get this for arbitrary sequences (finding a missing comma that is not the first one) and it was a bit more involved than I anticipated. I need to regroup and write a generalized version, but I feel like we could land this very specific one in the meantime, after I fix the typo.

@oli-obk

oli-obk commented Jul 31, 2018

Copy link
Copy Markdown
Contributor

Sgtm

@estebank

estebank commented Jul 31, 2018

Copy link
Copy Markdown
ContributorAuthor

Fixed the typo.

@oli-obk

oli-obk commented Jul 31, 2018

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jul 31, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit c4b7b1eec4ea0b354bce8c1fb417598b63710966 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 Jul 31, 2018
@rust-highfive

This comment has been minimized.

Sign in to view
@estebank

estebank commented Jul 31, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors r-

gonna rebase against master, it's probably stale

@borsbors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 31, 2018
@estebank

This comment has been minimized.

Sign in to view
@bors

bors commented Aug 7, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@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 Aug 7, 2018
@rust-highfive

This comment has been minimized.

Sign in to view
@oli-obk

oli-obk commented Aug 7, 2018

Copy link
Copy Markdown
Contributor

@bors retry

@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 Aug 7, 2018
@bors

bors commented Aug 7, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit daa5bd3 with merge 80be6b8e7f9b40181807bb6ea7afb5e856f7a1d0...

@bors

bors commented Aug 7, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@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 Aug 7, 2018
@rust-highfive

This comment has been minimized.

Sign in to view
@oli-obk

oli-obk commented Aug 7, 2018

Copy link
Copy Markdown
Contributor

@bors retry

@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 Aug 7, 2018
@bors

bors commented Aug 7, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit daa5bd3 with merge 3f4f18f...

bors added a commit that referenced this pull request Aug 7, 2018
@bors
Auto merge of#52397- estebank:println-comma, r=oli-obk
3f4f18f
Suggest comma when writing `println!("{}" a);`
Fix#49370.
@bors

bors commented Aug 8, 2018

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit daa5bd3 into rust-lang:masterAug 8, 2018
@sunjay

sunjay commented Aug 8, 2018

Copy link
Copy Markdown
Contributor

This is awesome! Thank you for doing this! I'm the one who filed the original issue about it and I really appreciate that it was fixed. 😁

@estebankestebank mentioned this pull request Aug 8, 2018
Merged
cramertj added a commit to cramertj/rust that referenced this pull request Aug 8, 2018
@cramertj
Rollup merge ofrust-lang#53183- estebank:println-comma, r=oli-obk
8e477f4
Suggest comma when missing in macro call
When missing a comma in a macro call, suggest it, regardless of
position. When a macro call doesn't match any of the patterns, check
if the call's token stream could be missing a comma between two idents,
and if so, create a new token stream containing the comma and try to
match against the macro patterns. If successful, emit the suggestion.
This works on arbitrary macros, with no need of special support from
the macro writers.
```
error: no rules expected the token `d`
--> $DIR/missing-comma.rs:26:18
|
LL | foo!(a, b, c d, e);
| -^
| |
| help: missing comma here
```
Follow up to rust-lang#52397.
cramertj added a commit to cramertj/rust that referenced this pull request Aug 8, 2018
@cramertj
Rollup merge ofrust-lang#53183- estebank:println-comma, r=oli-obk
35f7927
Suggest comma when missing in macro call
When missing a comma in a macro call, suggest it, regardless of
position. When a macro call doesn't match any of the patterns, check
if the call's token stream could be missing a comma between two idents,
and if so, create a new token stream containing the comma and try to
match against the macro patterns. If successful, emit the suggestion.
This works on arbitrary macros, with no need of special support from
the macro writers.
```
error: no rules expected the token `d`
--> $DIR/missing-comma.rs:26:18
|
LL | foo!(a, b, c d, e);
| -^
| |
| help: missing comma here
```
Follow up to rust-lang#52397.
cramertj added a commit to cramertj/rust that referenced this pull request Aug 8, 2018
@cramertj
Rollup merge ofrust-lang#53183- estebank:println-comma, r=oli-obk
327753d
Suggest comma when missing in macro call
When missing a comma in a macro call, suggest it, regardless of
position. When a macro call doesn't match any of the patterns, check
if the call's token stream could be missing a comma between two idents,
and if so, create a new token stream containing the comma and try to
match against the macro patterns. If successful, emit the suggestion.
This works on arbitrary macros, with no need of special support from
the macro writers.
```
error: no rules expected the token `d`
--> $DIR/missing-comma.rs:26:18
|
LL | foo!(a, b, c d, e);
| -^
| |
| help: missing comma here
```
Follow up to rust-lang#52397.
kennytm added a commit to kennytm/rust that referenced this pull request Aug 9, 2018
@kennytm
Rollup merge ofrust-lang#53183- estebank:println-comma, r=oli-obk
8188f12
Suggest comma when missing in macro call
When missing a comma in a macro call, suggest it, regardless of
position. When a macro call doesn't match any of the patterns, check
if the call's token stream could be missing a comma between two idents,
and if so, create a new token stream containing the comma and try to
match against the macro patterns. If successful, emit the suggestion.
This works on arbitrary macros, with no need of special support from
the macro writers.
```
error: no rules expected the token `d`
--> $DIR/missing-comma.rs:26:18
|
LL | foo!(a, b, c d, e);
| -^
| |
| help: missing comma here
```
Follow up to rust-lang#52397.
@pnkfelixpnkfelix mentioned this pull request Oct 8, 2018
Closed
@estebankestebank mentioned this pull request Mar 11, 2019
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk approved these changes

Assignees

@oli-obkoli-obk

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.

8 participants

@estebank@rust-highfive@oli-obk@emilyalbini@bors@sunjay@pnkfelix@stokhos