Suggest `i += 1` when we see `i++` or `++i` by camelid · Pull Request #88672 · rust-lang/rust

camelid · 2021-09-05T19:48:23Z

Closes#83502 (for i++ and ++i; --i should be covered by #82987, and i--
is tricky to handle).

This is a continuation of #83536.

camelid · 2021-09-13T01:19:40Z

Is there any way this could accidentally break macros that have i++–style syntax? I tested it a bit, and I didn't find any issues, but I thought it'd be worth bringing up.

camelid · 2021-09-13T02:33:10Z

(CI is just failing because I used // TODO, which was intentional so they would be resolved before this is merged.)

pnkfelix · 2021-11-19T15:23:58Z

Hi @camelid ; we visited this for triage.

It looks like you had some questions you wanted answered, but also, @estebank had a suggestion for a change they wanted to see.

What is the status on those fronts? Do you think you are stuck waiting for more feedback from @estebank, or can you make forward progress on the suggestion they provided in the meantime?

camelid · 2021-11-19T15:32:30Z

It's been a while, but my recollection is that I implemented most of the user-facing side of what estebank suggested, but in a different way in the parser because I got stuck with the way estebank suggested. The way the change is implemented currently works pretty well, though sometimes the suggestions aren't as good as they could be. Perhaps it would be good to accept the current state of output as good enough for an "MVP PR" since it can be improved further in the future. That's of course assuming there aren't any major issues in the output.

So, in summary: I think I need estebank to see if the impl looks okay and the error output looks good enough for a first implementation.

camelid · 2021-12-10T03:03:06Z

@estebank could you take another look at this when you get a chance?

bors · 2021-12-15T03:42:06Z

☔ The latest upstream changes (presumably #91933) made this pull request unmergeable. Please resolve the merge conflicts.

camelid · 2021-12-15T18:42:02Z

I'll wait to rebase until this is reviewed in case it needs more rebases.

camelid · 2022-01-25T20:18:09Z

r? @davidtwco

This solves the TODO.

This records that the suggestions are mutually-exclusive (i.e., only one should be applied).

`run-rustfix` applies all suggestions regardless of their Applicability. There's a flag, `rustfix-only-machine-applicable`, that does what it says, but then the produced `.fixed` file would have invalid code from the suggestions that weren't applied. So, I moved the cases of postfix increment, in which case multiple suggestions are given, to the `-notfixed` test, which does not run rustfix. I also changed the Applicability to Unspecified since MaybeIncorrect requires that the code be valid, even if it's incorrect.

I changed the test functions to be `pub` rather than called from a `main` function too, for easier future modification of tests.

camelid · 2022-03-27T20:54:57Z

Ok, hopefully CI should pass now.

davidtwco · 2022-04-01T03:01:11Z

This is great, thanks for seeing this through. Could you squash some of the commits? r=me after that.

camelid · 2022-04-02T03:30:07Z

@davidtwco It's hard to squash without squashing all of them into one commit, and I'd rather keep the history to make it easier to understand the design choices for the code (e.g., when git blameing). Is it okay to leave it unsquashed?

davidtwco · 2022-04-03T05:24:12Z

@bors r+

bors · 2022-04-03T05:24:14Z

📌 Commit 4943688 has been approved by davidtwco

bors · 2022-04-03T05:24:24Z

⌛ Testing commit 4943688 with merge 133859d...

bors · 2022-04-03T07:53:04Z

☀️ Test successful - checks-actions
Approved by: davidtwco
Pushing 133859d to master...

rust-timer · 2022-04-03T09:06:29Z

Finished benchmarking commit (133859d): comparison url.

Summary:

Primary benchmarks: no relevant changes found
Secondary benchmarks: no relevant changes found. 2 results were found to be statistically significant but too small to be relevant.

	Regressions 😿 (primary)	Regressions 😿 (secondary)	Improvements 🎉 (primary)	Improvements 🎉 (secondary)	All 😿 🎉 (primary)
count¹	0	2	0	0	0
mean²	N/A	1.4%	N/A	N/A	N/A
max	N/A	2.6%	N/A	N/A	N/A

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

number of relevant changes↩
the arithmetic mean of the percent change↩

camelid · 2022-04-03T22:17:12Z

Thank you so much for helping me with this PR and being patient even though it took me forever to finish it! ❤️

camelid added A-diagnostics Area: Messages for errors, warnings, and lints A-suggestion-diagnostics Area: Suggestions generated by the compiler applied by `cargo fix` labels Sep 5, 2021

rust-highfive assigned estebank Sep 5, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 5, 2021

camelid commented Sep 5, 2021
View reviewed changes

Comment threadsrc/test/ui/parser/increment.stderr Outdated

camelid commented Sep 5, 2021
View reviewed changes

Comment threadcompiler/rustc_parse/src/parser/diagnostics.rs Outdated

camelid added the A-parser Area: The lexing & parsing of Rust source code to an AST label Sep 5, 2021

b-naber reviewed Sep 6, 2021
View reviewed changes

Comment threadcompiler/rustc_parse/src/parser/diagnostics.rs Outdated

estebank reviewed Sep 6, 2021
View reviewed changes

Comment threadcompiler/rustc_parse/src/parser/diagnostics.rs Outdated
Comment threadcompiler/rustc_parse/src/parser/diagnostics.rs Outdated

camelid 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 6, 2021

This comment has been minimized.
Sign in to view

camelid commented Sep 13, 2021
View reviewed changes

camelid force-pushed the inc-parser-sugg branch from 73917be to f72a701Compare September 13, 2021 01:17

This comment has been minimized.
Sign in to view

apiraino added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 13, 2021

JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 3, 2021

joelpalmer added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 19, 2021

JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 8, 2021

camelid added 10 commits March 23, 2022 22:31

Emit both subexp and standalone sugg for postfix
62b8ea6
This solves the TODO.

Improve handling of tmp variable name conflicts
073010d

Bless tests
713a11b

Improve function names
29a5c36

Add heuristic to avoid treating x + +2 as increment
4212835

Make standalone an enum
95960b7

Change temporary variable name if it would conflict
ef74796

Use multipart_suggestions
725cde4
This records that the suggestions are mutually-exclusive (i.e., only one should be applied).

Fix from rebase
4943688
I changed the test functions to be `pub` rather than called from a `main` function too, for easier future modification of tests.

camelid force-pushed the inc-parser-sugg branch from af8c4fe to 4943688Compare March 27, 2022 20:54

davidtwco approved these changes Apr 1, 2022
View reviewed changes

davidtwco 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 Apr 1, 2022

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 Apr 3, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 3, 2022

bors merged commit 133859d into rust-lang:masterApr 3, 2022

rustbot added this to the 1.61.0 milestone Apr 3, 2022

bors mentioned this pull request Apr 3, 2022
diagnostics: translation infrastructure #95512
Merged

camelid deleted the inc-parser-sugg branch April 3, 2022 22:16

Uh oh!

Uh oh!

Conversation

camelid commented Sep 5, 2021• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

camelid commented Sep 13, 2021

Uh oh!

This comment has been minimized.

camelid commented Sep 13, 2021

Uh oh!

pnkfelix commented Nov 19, 2021

Uh oh!

camelid commented Nov 19, 2021• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

camelid commented Dec 10, 2021

Uh oh!

bors commented Dec 15, 2021

Uh oh!

camelid commented Dec 15, 2021

Uh oh!

camelid commented Jan 25, 2022

Uh oh!

camelid commented Mar 27, 2022

Uh oh!

davidtwco commented Apr 1, 2022

Uh oh!

camelid commented Apr 2, 2022

Uh oh!

davidtwco commented Apr 3, 2022

Uh oh!

bors commented Apr 3, 2022

Uh oh!

bors commented Apr 3, 2022

Uh oh!

bors commented Apr 3, 2022

Uh oh!

rust-timer commented Apr 3, 2022

Footnotes

Uh oh!

camelid commented Apr 3, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

camelid commented Sep 5, 2021•
edited
Loading

camelid commented Nov 19, 2021•
edited
Loading