nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-22 11:53:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ensure there are no stmts for expr check

Browse Source
This commit is contained in:
Centri3 2023-06-09 11:43:58 -05:00
parent 0c545c7bcc
commit c1c134a288
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clippy_lints/src/mixed_read_write_in_expression.rs
View File

@ -139,13 +139,13 @@ impl<'a, 'tcx> Visitor<'tcx> for DivergenceVisitor<'a, 'tcx> {
match e.kind {
// fix #10776
ExprKind::Block(block, ..) => {
if let Some(e) = block.expr {
if let Some(e) = block.expr && block.stmts.is_empty() {
self.visit_expr(e);
return;
}
if let [stmt] = block.stmts && block.stmts.len() == 1 {
if let [stmt, rest @ ..] = block.stmts && rest.is_empty() {
match stmt.kind {
StmtKind::Expr(e) | StmtKind::Semi(e) => self.visit_expr(e),
_ => {},

14
tests/ui/diverging_sub_expression.stderr
View File

@ -62,23 +62,11 @@ error: sub-expression diverges
LL | 18 => false || { return },
| ^^^^^^
error: sub-expression diverges
--> $DIR/diverging_sub_expression.rs:47:36
|
LL | 19 => true || { _ = 1; return },
| ^^^^^^
error: sub-expression diverges
--> $DIR/diverging_sub_expression.rs:48:37
|
LL | 20 => false || { _ = 1; return },
| ^^^^^^
error: sub-expression diverges
--> $DIR/diverging_sub_expression.rs:52:26
|
LL | _ => true || break,
| ^^^^^
error: aborting due to 13 previous errors
error: aborting due to 11 previous errors