Suggest 1-tuple parentheses on exprs without existing parens #91530

bobrippling · 2021-12-04T17:44:40Z

A follow-on from #86116, split out from #90677.

This alters the suggestion to add a trailing comma to create a 1-tuple - previously we would only apply this if the relevant expression was parenthesised. We now make the suggestion regardless of parentheses, which reduces the fragility of the check (w.r.t formatting).

e.g.

let a: Option<(i32,)> = Some(3);

gets the below suggestion:

let a: Option<(i32,)> = Some((3,));
//                           ^ ^^

This change also improves the suggestion in other ways, such as by only making the suggestion if the types would match after the suggestion is applied and making the suggestion a multipart suggestion.

rust-highfive · 2021-12-04T17:44:43Z

r? @nagisa

(rust-highfive has picked a reviewer for you, use r? to override)

bobrippling · 2021-12-04T17:47:49Z

r? @camelid

compiler/rustc_infer/src/infer/error_reporting/mod.rs

src/test/ui/typeck/issue-84768.stderr

camelid · 2021-12-05T01:08:19Z

Hmm, I guess the reason this didn't use a multipart suggestion was in case there were already parentheses.

bobrippling · 2021-12-05T17:00:33Z

Hmm, I guess the reason this didn't use a multipart suggestion was in case there were already parentheses.

Yeah I guess that's the trouble. I think the multipart suggestion is nicer, particularly for giving tools a minimal diff to work with rather than pasting the whole sub-expression over the top. I'd like to keep the multipart suggestion - would you be ok with something like this?

if code.starts_with('(') && code.ends_with(')') {
    <original span_suggestion>
} else {
    <multipart_suggestion>
}

camelid · 2021-12-05T19:56:15Z

What about this?

if code.starts_with('(') && code.ends_with(')') {
    <suggest adding a comma at span.with_hi(span.hi - 1)>
} else {
    <multipart suggestion>
}

bors · 2022-01-21T00:06:54Z

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

bobrippling · 2022-01-21T07:30:53Z

(holding off on this PR until its sibling #90677 is all good)

bobrippling · 2022-01-28T23:50:02Z

Multi-part suggestion and comma insertion sorted, happy for another review

camelid

Looks great, just a couple comments!

compiler/rustc_infer/src/infer/error_reporting/mod.rs

camelid · 2022-02-06T21:42:36Z

Thanks again!

@bors r+

bors · 2022-02-06T21:42:37Z

📌 Commit 82a0122 has been approved by camelid

… r=camelid Suggest 1-tuple parentheses on exprs without existing parens A follow-on from rust-lang#86116, split out from rust-lang#90677. This alters the suggestion to add a trailing comma to create a 1-tuple - previously we would only apply this if the relevant expression was parenthesised. We now make the suggestion regardless of parentheses, which reduces the fragility of the check (w.r.t formatting). e.g. ```rust let a: Option<(i32,)> = Some(3); ``` gets the below suggestion: ```rust let a: Option<(i32,)> = Some((3,)); // ^ ^^ ``` This change also improves the suggestion in other ways, such as by only making the suggestion if the types would match after the suggestion is applied and making the suggestion a multipart suggestion.

Rollup of 13 pull requests Successful merges: - rust-lang#88313 (Make the pre-commit script pre-push instead) - rust-lang#91530 (Suggest 1-tuple parentheses on exprs without existing parens) - rust-lang#92724 (Cleanup c_str.rs) - rust-lang#93208 (Impl {Add,Sub,Mul,Div,Rem,BitXor,BitOr,BitAnd}Assign<$t> for Wrapping<$t> for rust 1.60.0) - rust-lang#93394 (Don't allow {} to refer to implicit captures in format_args.) - rust-lang#93416 (remove `allow_fail` test flag) - rust-lang#93487 (Fix linking stage1 toolchain in `./x.py setup`) - rust-lang#93673 (Linkify sidebar headings for sibling items) - rust-lang#93680 (Drop json::from_reader) - rust-lang#93682 (Update tracking issue for `const_fn_trait_bound`) - rust-lang#93722 (Use shallow clones for submodules managed by rustbuild, not just bootstrap.py) - rust-lang#93723 (Rerun bootstrap's build script when RUSTC changes) - rust-lang#93737 (bootstrap: prefer using '--config' over 'RUST_BOOTSTRAP_CONFIG') Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned nagisa Dec 4, 2021

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

rust-highfive assigned camelid and unassigned nagisa Dec 4, 2021

bobrippling mentioned this pull request Dec 4, 2021

Suggest tuple-parentheses for enum variants #90677

Merged

camelid added A-suggestion-diagnostics Area: Suggestions generated by the compiler applied by `cargo fix` T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 4, 2021

camelid reviewed Dec 4, 2021

View reviewed changes

compiler/rustc_infer/src/infer/error_reporting/mod.rs Outdated Show resolved Hide resolved

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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 4, 2021

camelid reviewed Dec 4, 2021

View reviewed changes

src/test/ui/typeck/issue-84768.stderr Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

bobrippling added 4 commits January 28, 2022 22:44

Suggest 1-tuple parentheses, without existing parens

4738ce4

Replace span suggestion with multipart

c734c32

Handle existing parentheses when suggesting trailing-tuple-comma

18cea90

Only suggest 1-tuple if expected and found types match

91a43f0

bobrippling force-pushed the suggest-1-tuple-parens branch from d8f4d01 to a57f345 Compare January 28, 2022 23:46

This comment has been minimized.

Sign in to view

Test 1-tuple parentheses wrapping

72d3b45

bobrippling force-pushed the suggest-1-tuple-parens branch from a57f345 to 72d3b45 Compare January 29, 2022 10:32

camelid approved these changes Jan 29, 2022

View reviewed changes

compiler/rustc_infer/src/infer/error_reporting/mod.rs Outdated Show resolved Hide resolved

compiler/rustc_infer/src/infer/error_reporting/mod.rs Outdated Show resolved Hide resolved

compiler/rustc_infer/src/infer/error_reporting/mod.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

bobrippling force-pushed the suggest-1-tuple-parens branch from ed70f7a to 4607c33 Compare February 2, 2022 22:34

camelid added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 3, 2022

camelid reviewed Feb 3, 2022

View reviewed changes

compiler/rustc_infer/src/infer/error_reporting/mod.rs Outdated Show resolved Hide resolved

bobrippling force-pushed the suggest-1-tuple-parens branch from 4607c33 to e56bb6f Compare February 4, 2022 08:14

This comment has been minimized.

Sign in to view

bobrippling added 2 commits February 6, 2022 20:58

Factor out emit_tuple_wrap_err, improve Applicability

344ea6e

Merge duplicate suggestion string

82a0122

bobrippling force-pushed the suggest-1-tuple-parens branch from e56bb6f to 82a0122 Compare February 6, 2022 20:58

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 6, 2022

matthiaskrgr mentioned this pull request Feb 7, 2022

Rollup of 9 pull requests #93734

Closed

m-ou-se mentioned this pull request Feb 7, 2022

Rollup of 13 pull requests #93736

Closed

m-ou-se mentioned this pull request Feb 7, 2022

Rollup of 13 pull requests #93738

Merged

bors merged commit 557d300 into rust-lang:master Feb 7, 2022

rustbot added this to the 1.60.0 milestone Feb 7, 2022

jackh726 mentioned this pull request Apr 16, 2022

Better method call error messages #92364

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Suggest 1-tuple parentheses on exprs without existing parens #91530

Suggest 1-tuple parentheses on exprs without existing parens #91530

bobrippling commented Dec 4, 2021 •

edited by camelid

Loading

rust-highfive commented Dec 4, 2021

bobrippling commented Dec 4, 2021

This comment has been minimized.

camelid commented Dec 5, 2021

bobrippling commented Dec 5, 2021

camelid commented Dec 5, 2021

bors commented Jan 21, 2022

bobrippling commented Jan 21, 2022

bobrippling commented Jan 28, 2022

This comment has been minimized.

camelid left a comment

This comment has been minimized.

This comment has been minimized.

camelid commented Feb 6, 2022

bors commented Feb 6, 2022

Suggest 1-tuple parentheses on exprs without existing parens #91530

Suggest 1-tuple parentheses on exprs without existing parens #91530

Conversation

bobrippling commented Dec 4, 2021 • edited by camelid Loading

rust-highfive commented Dec 4, 2021

bobrippling commented Dec 4, 2021

This comment has been minimized.

camelid commented Dec 5, 2021

bobrippling commented Dec 5, 2021

camelid commented Dec 5, 2021

bors commented Jan 21, 2022

bobrippling commented Jan 21, 2022

bobrippling commented Jan 28, 2022

This comment has been minimized.

camelid left a comment

Choose a reason for hiding this comment

This comment has been minimized.

This comment has been minimized.

camelid commented Feb 6, 2022

bors commented Feb 6, 2022

bobrippling commented Dec 4, 2021 •

edited by camelid

Loading