Skip to content

Suggest unwrap_or_else when a closure is given - #102441

Merged
bors merged 1 commit into
rust-lang:masterfrom
chenyukang:fix-102320-unwrap_or_else
Oct 4, 2022
Merged

Suggest unwrap_or_else when a closure is given#102441
bors merged 1 commit into
rust-lang:masterfrom
chenyukang:fix-102320-unwrap_or_else

Conversation

@chenyukang

@chenyukangchenyukang commented Sep 28, 2022

Copy link
Copy Markdown
Member

@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 28, 2022
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 28, 2022
@chenyukang

chenyukang commented Sep 28, 2022

Copy link
Copy Markdown
MemberAuthor

May need more work to expand to suggest map_or_else, etc.

chenyukang
chenyukang commented Sep 28, 2022
View reviewed changes
Comment threadcompiler/rustc_hir_analysis/src/check/fn_ctxt/suggestions.rs Outdated
@chenyukang
chenyukangforce-pushed the fix-102320-unwrap_or_else branch from fcc5a23 to 5c3a8e2CompareSeptember 28, 2022 22:09
compiler-errors
compiler-errors suggested changes Sep 29, 2022
View reviewed changes
Comment threadcompiler/rustc_hir_analysis/src/check/fn_ctxt/suggestions.rs Outdated
Comment threadcompiler/rustc_hir_analysis/src/check/fn_ctxt/suggestions.rs Outdated
Comment threadcompiler/rustc_hir_analysis/src/check/fn_ctxt/suggestions.rs Outdated
Comment threadcompiler/rustc_hir_analysis/src/check/fn_ctxt/suggestions.rs Outdated
Comment threadcompiler/rustc_hir_analysis/src/check/fn_ctxt/suggestions.rs Outdated
@bors

bors commented Oct 1, 2022

Copy link
Copy Markdown
Collaborator

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

@chenyukang
chenyukangforce-pushed the fix-102320-unwrap_or_else branch from 5c3a8e2 to aebc5e1CompareOctober 2, 2022 06:01
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@chenyukang
chenyukangforce-pushed the fix-102320-unwrap_or_else branch from aebc5e1 to 5d69f3aCompareOctober 2, 2022 09:26
@chenyukang
fixrust-lang#102320, suggest unwrap_or_else when a closure is passed…
0188273
… to unwrap_or instead of suggesting calling it
@chenyukang
chenyukangforce-pushed the fix-102320-unwrap_or_else branch from 5d69f3a to f712c41CompareOctober 2, 2022 14:22
compiler-errors
compiler-errors reviewed Oct 3, 2022
View reviewed changes
Comment threadcompiler/rustc_hir_analysis/src/check/method/suggest.rs Outdated

@compiler-errorscompiler-errorsOct 3, 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.

This doesn't need to be an argument. Can you inline the can_coerce call here by passing in expected: Ty<'tcx>?

Comment threadcompiler/rustc_hir_analysis/src/check/method/suggest.rs Outdated

@compiler-errorscompiler-errorsOct 3, 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.

I think there is an expr_ty_opt version of this that doesn't ICE if the node is missing a type If so, then please use that, just in case.

Comment threadcompiler/rustc_hir_analysis/src/check/method/suggest.rs Outdated

@compiler-errorscompiler-errorsOct 3, 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.

Suggested change
fn_args.len() == args.len() +1{
fn_args.len() == args.len() +1{

Comment threadcompiler/rustc_hir_analysis/src/check/method/suggest.rs Outdated
Comment on lines 2366 to 2367

@compiler-errorscompiler-errorsOct 3, 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.

Suggested change
let fn_ty = self.tcx.type_of(pick.item.def_id) &&
let fn_sig = fn_ty.fn_sig(self.tcx) &&
let fn_sig = self.tcx.fn_sig(pick.item.def_id) &&

@compiler-errors

compiler-errors commented Oct 3, 2022

Copy link
Copy Markdown
Contributor

Few more nits

@chenyukang
chenyukangforce-pushed the fix-102320-unwrap_or_else branch from f712c41 to 0188273CompareOctober 3, 2022 06:01
@chenyukang

chenyukang commented Oct 3, 2022

Copy link
Copy Markdown
MemberAuthor

Few more nits

Fixed, thanks!

@compiler-errors

compiler-errors commented Oct 4, 2022

Copy link
Copy Markdown
Contributor

Hm, this suggestion might have some false positives still, but this is probably ok...

@bors r+

@bors

bors commented Oct 4, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 0188273 has been approved by compiler-errors

It is now in the queue for this repository.

@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 Oct 4, 2022
@matthiaskrgrmatthiaskrgr mentioned this pull request Oct 4, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 4, 2022
@bors
Auto merge ofrust-lang#102644- matthiaskrgr:rollup-rg0sw41, r=matth…
f111209
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#102441 (Suggest unwrap_or_else when a closure is given)
- rust-lang#102547 (Migrate CSS theme for search results)
- rust-lang#102567 (Delay evaluating lint primary message until after it would be suppressed)
- rust-lang#102624 (rustdoc: remove font family CSS on `.rustdoc-toggle summary::before`)
- rust-lang#102628 (Change the parameter name of From::from to `value`)
- rust-lang#102637 (Ignore fuchsia on two compiler tests)
- rust-lang#102639 (Improve spans when splitting multi-char operator tokens for proc macros.)
Failed merges:
- rust-lang#102496 (Suggest `.into()` when all other coercion suggestions fail)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit a2126e7 into rust-lang:masterOct 4, 2022
@rustbotrustbot added this to the 1.66.0 milestone Oct 4, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@compiler-errorscompiler-errorscompiler-errors requested changes
Reviewers whose approvals may not affect merge requirements

Assignees

@compiler-errorscompiler-errors

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.66.0

Development

Successfully merging this pull request may close these issues.

Suggest unwrap_or_else when a closure is passed to unwrap_or instead of suggesting calling it

6 participants

@chenyukang@bors@rust-log-analyzer@compiler-errors@rust-highfive@rustbot