Merge remote-tracking branch 'origin/beta_backport' into HEAD

[rust.git] / tests / ui / block_in_if_condition.stderr

diff --git a/tests/ui/block_in_if_condition.stderr b/tests/ui/block_in_if_condition.stderr
index d3e869024a7d1f07b9714ce9650517ae7fcfb990..0876d5db6964152aa585e57f11f4210f90d47909 100644 (file)
--- a/tests/ui/block_in_if_condition.stderr
+++ b/tests/ui/block_in_if_condition.stderr
@@ -1,18 +1,14 @@
 error: in an 'if' condition, avoid complex blocks or closures with blocks; instead, move the block or closure higher and bind it with a 'let'
-  --> $DIR/block_in_if_condition.rs:30:8
+  --> $DIR/block_in_if_condition.rs:26:8
    |
-30 |       if {
-   |  ________^ starting here...
-31 | |         let x = 3;
-32 | |         x == 3
-33 | |     } {
-   | |_____^ ...ending here
+LL |       if {
+   |  ________^
+LL | |         let x = 3;
+LL | |         x == 3
+LL | |     } {
+   | |_____^
    |
-note: lint level defined here
-  --> $DIR/block_in_if_condition.rs:5:9
-   |
-5  | #![deny(block_in_if_condition_stmt)]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: `-D clippy::block-in-if-condition-stmt` implied by `-D warnings`
    = help: try
            let res = {
                let x = 3;
@@ -23,46 +19,44 @@ note: lint level defined here
            } ... 
 
 error: omit braces around single expression condition
-  --> $DIR/block_in_if_condition.rs:41:8
+  --> $DIR/block_in_if_condition.rs:37:8
    |
-41 |     if { true } {
+LL |     if { true } {
    |        ^^^^^^^^
    |
-note: lint level defined here
-  --> $DIR/block_in_if_condition.rs:4:9
-   |
-4  | #![deny(block_in_if_condition_expr)]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: `-D clippy::block-in-if-condition-expr` implied by `-D warnings`
    = help: try
            if true {
                6
            } ... 
 
 error: in an 'if' condition, avoid complex blocks or closures with blocks; instead, move the block or closure higher and bind it with a 'let'
-  --> $DIR/block_in_if_condition.rs:58:49
-   |
-58 |     if v == 3 && sky == "blue" && predicate(|x| { let target = 3; x == target }, v) {
-   |                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  --> $DIR/block_in_if_condition.rs:58:17
+   |
+LL |               |x| {
+   |  _________________^
+LL | |                 let target = 3;
+LL | |                 x == target
+LL | |             },
+   | |_____________^
 
 error: in an 'if' condition, avoid complex blocks or closures with blocks; instead, move the block or closure higher and bind it with a 'let'
-  --> $DIR/block_in_if_condition.rs:62:22
-   |
-62 |     if predicate(|x| { let target = 3; x == target }, v) {
-   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  --> $DIR/block_in_if_condition.rs:67:13
+   |
+LL |           |x| {
+   |  _____________^
+LL | |             let target = 3;
+LL | |             x == target
+LL | |         },
+   | |_________^
 
-warning: this boolean expression can be simplified
-  --> $DIR/block_in_if_condition.rs:70:8
-   |
-70 |     if true && x == 3 {
-   |        ^^^^^^^^^^^^^^
+error: this boolean expression can be simplified
+  --> $DIR/block_in_if_condition.rs:77:8
    |
-note: lint level defined here
-  --> $DIR/block_in_if_condition.rs:7:9
+LL |     if true && x == 3 {
+   |        ^^^^^^^^^^^^^^ help: try: `x == 3`
    |
-7  | #![warn(nonminimal_bool)]
-   |         ^^^^^^^^^^^^^^^
-help: try
-   |     if x == 3 {
+   = note: `-D clippy::nonminimal-bool` implied by `-D warnings`
 
-error: aborting due to 4 previous errors
+error: aborting due to 5 previous errors