Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Account for ExprKind::Block when suggesting .into() and deref #83952

Merged
merged 1 commit into from
Apr 8, 2021

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Apr 7, 2021

Fix #83943.

@rust-highfive
Copy link
Collaborator

r? @petrochenkov

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 7, 2021
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Apr 7, 2021

📌 Commit e1efa17 has been approved by petrochenkov

@bors 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 Apr 7, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 8, 2021
Rollup of 5 pull requests

Successful merges:

 - rust-lang#82497 (Fix handling of `--output-format json` flag)
 - rust-lang#83689 (Add more info for common trait resolution and async/await errors)
 - rust-lang#83952 (Account for `ExprKind::Block` when suggesting .into() and deref)
 - rust-lang#83965 (Add Debug implementation for hir::intravisit::FnKind)
 - rust-lang#83974 (Fix outdated crate names in `rustc_interface::callbacks`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 97c50d5 into rust-lang:master Apr 8, 2021
@rustbot rustbot added this to the 1.53.0 milestone Apr 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

E0308 suggests to use to_string() in wrong position if if and else have incompatible types
6 participants