Suggest removing superfluous semicolon when statements used as expression#121153
Merged
bors merged 2 commits intorust-lang:masterfrom Mar 2, 2024
Merged
Suggest removing superfluous semicolon when statements used as expression#121153bors merged 2 commits intorust-lang:masterfrom
bors merged 2 commits intorust-lang:masterfrom
Conversation
Collaborator
|
rustbot has assigned @michaelwoerister. Use r? to explicitly pick a reviewer |
rustbot
added
S-waiting-on-review
chenyukang
commented
Feb 15, 2024
| let node = self.tcx.hir_node(*hir_id); | ||
| let mut blocks = vec![]; | ||
| if let hir::Node::Block(block) = node | ||
| && let Some(expr) = block.expr |
Member
Author
There was a problem hiding this comment.
it seems hard to make it pure recursive, because I want to use self.tcx.parent_hir_node(..), and local function can not capture self.
Member
|
r? diagnostics |
Collaborator
|
☔ The latest upstream changes (presumably #120576) made this pull request unmergeable. Please resolve the merge conflicts. |
chenyukang
force-pushed
the
yukang-fix-105431-type-mismatch
branch
from
0d1b0f8 to
29cb86c
Compare
estebank
approved these changes
Feb 22, 2024
| } | ||
| } | ||
|
|
||
| pub(super) fn suggest_for_statments_as_exp( |
Contributor
There was a problem hiding this comment.
Could we rename this to suggest_turning_stmt_into_expr or something?
Collaborator
|
☔ The latest upstream changes (presumably #121489) made this pull request unmergeable. Please resolve the merge conflicts. |
chenyukang
force-pushed
the
yukang-fix-105431-type-mismatch
branch
from
29cb86c to
e2ce5d7
Compare
Member
Author
|
@rustbot r=estebank |
estebank
reviewed
Mar 1, 2024
| }; | ||
| use rustc_hir_analysis::astconv::AstConv; | ||
| use rustc_infer::traits::{self, StatementAsExpression}; | ||
| use rustc_infer::traits::{self}; |
Contributor
There was a problem hiding this comment.
Suggested change
| use rustc_infer::traits::{self}; | |
| use rustc_infer::traits; |
Contributor
|
@bors r+ |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 2, 2024
…iaskrgr Rollup of 11 pull requests Successful merges: - rust-lang#111505 (Made `INVALID_DOC_ATTRIBUTES` lint deny by default) - rust-lang#120305 (Delete line if suggestion would replace it with an empty line) - rust-lang#121153 (Suggest removing superfluous semicolon when statements used as expression) - rust-lang#121497 (`-Znext-solver=coherence`: suggest increasing recursion limit) - rust-lang#121634 (Clarify behavior of slice prefix/suffix operations in case of equality) - rust-lang#121706 (match lowering: Remove hacky branch in sort_candidate) - rust-lang#121730 (Add profiling support to AIX) - rust-lang#121750 (match lowering: Separate the `bool` case from other integers in `TestKind`) - rust-lang#121803 (Never say "`Trait` is implemented for `{type error}`") - rust-lang#121811 (Move sanitizer ui tests to sanitizer directory) - rust-lang#121824 (Implement missing ABI structures in StableMIR) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 2, 2024
Rollup merge of rust-lang#121153 - chenyukang:yukang-fix-105431-type-mismatch, r=estebank Suggest removing superfluous semicolon when statements used as expression Fixes rust-lang#105431 - it's not a pure recursive visitor, so I guess there may be some more complex scenarios not covered. - moved `consider_removing_semicolon` to `compiler/rustc_infer` for reusing this helper function.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #105431
consider_removing_semicolontocompiler/rustc_inferfor reusing this helper function.