Skip to content

Suggest adding a semicolon to a closure without block - #97371

Merged
bors merged 2 commits into
rust-lang:masterfrom
ChayimFriedman2:closure-non-block-add-semicolon
May 31, 2022
Merged

Suggest adding a semicolon to a closure without block#97371
bors merged 2 commits into
rust-lang:masterfrom
ChayimFriedman2:closure-non-block-add-semicolon

Conversation

@ChayimFriedman2

@ChayimFriedman2ChayimFriedman2 commented May 24, 2022

Copy link
Copy Markdown
Contributor

This transforms || expr into || { expr; }.

Closes#97359.

@ChayimFriedman2
Suggest adding a semicolon to a closure without block
bf0193d
This transforms `|| expr` into `|| { expr; }`.
@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label May 24, 2022
@rust-highfive

rust-highfive commented May 24, 2022

Copy link
Copy Markdown
Contributor

r? @oli-obk

(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 May 24, 2022
ChayimFriedman2
ChayimFriedman2 commented May 24, 2022
View reviewed changes
Comment threadcompiler/rustc_typeck/src/check/coercion.rs
ChayimFriedman2
ChayimFriedman2 commented May 24, 2022
View reviewed changes
Comment threadcompiler/rustc_typeck/src/check/coercion.rs
ChayimFriedman2
ChayimFriedman2 commented May 24, 2022
View reviewed changes
Comment threadcompiler/rustc_typeck/src/check/fn_ctxt/suggestions.rs
oli-obk
oli-obk requested changes May 30, 2022
View reviewed changes

@oli-obkoli-obk 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.

Just some code golfing, logic is sound.

Comment threadcompiler/rustc_typeck/src/check/coercion.rs Outdated
Comment threadcompiler/rustc_typeck/src/check/coercion.rs Outdated
Comment threadcompiler/rustc_typeck/src/check/fn_ctxt/suggestions.rs
err: &mut Diagnostic,
expression: &'tcx hir::Expr<'tcx>,
expected: Ty<'tcx>,
needs_block: bool,

@oli-obkoli-obkMay 30, 2022

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.

Not a fan of the bool argument, but I can't come up with anything clearer right now

@ChayimFriedman2ChayimFriedman2May 30, 2022

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.

Neither am I :) Maybe an enum will do?

@oli-obk

oli-obk commented May 31, 2022

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented May 31, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 6afaffb 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-review Status: Awaiting review from the assignee but also interested parties. labels May 31, 2022
@Dylan-DPCDylan-DPC mentioned this pull request May 31, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 31, 2022
@bors
Auto merge ofrust-lang#97574- Dylan-DPC:rollup-jq850l6, r=Dylan-DPC
d35d972
Rollup of 6 pull requests
Successful merges:
- rust-lang#97089 (Improve settings theme display)
- rust-lang#97229 (Document the current aliasing rules for `Box<T>`.)
- rust-lang#97371 (Suggest adding a semicolon to a closure without block)
- rust-lang#97455 (Stabilize `toowned_clone_into`)
- rust-lang#97565 (Add doc alias `memset` to `write_bytes`)
- rust-lang#97569 (Remove `memset` alias from `fill_with`.)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 38d8167 into rust-lang:masterMay 31, 2022
@rustbotrustbot added this to the 1.63.0 milestone May 31, 2022
@ChayimFriedman2
ChayimFriedman2 deleted the closure-non-block-add-semicolon branch May 31, 2022 16:35
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.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.63.0

Development

Successfully merging this pull request may close these issues.

"Consider adding a semicolon here" for a closure without block

5 participants

@ChayimFriedman2@rust-highfive@oli-obk@bors@rustbot