Auto merge of #68717 - petrochenkov:stabexpat, r=varkor

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

diff --git a/tests/ui/needless_continue.stderr b/tests/ui/needless_continue.stderr
index 06f63ee496ee36246e712c33e7bad755874defab..8d6a37df9601afcd1fdf9094a442b4422cf0c6fc 100644 (file)
--- a/tests/ui/needless_continue.stderr
+++ b/tests/ui/needless_continue.stderr
@@ -1,59 +1,99 @@
-error: This else block is redundant.
-
-  --> $DIR/needless_continue.rs:36:16
+error: this `else` block is redundant
+  --> $DIR/needless_continue.rs:28:16
    |
-36 |           } else {
+LL |           } else {
    |  ________________^
-37 | |             continue;
-38 | |         }
+LL | |             continue;
+LL | |         }
    | |_________^
    |
    = note: `-D clippy::needless-continue` implied by `-D warnings`
-   = help: Consider dropping the else clause and merging the code that follows (in the loop) with the if block, like so:
-           if i % 2 == 0 && i % 3 == 0 {
-           println!("{}", i);
-           println!("{}", i + 1);
-           if i % 5 == 0 {
-               println!("{}", i + 2);
-           }
-           let i = 0;
-           println!("bar {} ", i);
-           // Merged code follows...println!("bleh");
-           {
-               println!("blah");
-           }
-           if !(!(i == 2) || !(i == 5)) {
-               println!("lama");
-           }
-           if (zero!(i % 2) || nonzero!(i % 5)) && i % 3 != 0 {
-               continue;
-           } else {
-               println!("Blabber");
-               println!("Jabber");
-           }
-           println!("bleh");
-           }
-           
-
-error: There is no need for an explicit `else` block for this `if` expression
+   = help: consider dropping the `else` clause and merging the code that follows (in the loop) with the `if` block
+                   if i % 2 == 0 && i % 3 == 0 {
+                       println!("{}", i);
+                       println!("{}", i + 1);
+                       if i % 5 == 0 {
+                           println!("{}", i + 2);
+                       }
+                       let i = 0;
+                       println!("bar {} ", i);
+                       // merged code follows:
+                       println!("bleh");
+                       {
+                           println!("blah");
+                       }
+                       if !(!(i == 2) || !(i == 5)) {
+                           println!("lama");
+                       }
+                       if (zero!(i % 2) || nonzero!(i % 5)) && i % 3 != 0 {
+                           continue;
+                       } else {
+                           println!("Blabber");
+                           println!("Jabber");
+                       }
+                       println!("bleh");
+                   }
 
-  --> $DIR/needless_continue.rs:51:9
-   |
-51 | /         if (zero!(i % 2) || nonzero!(i % 5)) && i % 3 != 0 {
-52 | |             continue;
-53 | |         } else {
-54 | |             println!("Blabber");
-55 | |             println!("Jabber");
-56 | |         }
+error: there is no need for an explicit `else` block for this `if` expression
+  --> $DIR/needless_continue.rs:43:9
+   |
+LL | /         if (zero!(i % 2) || nonzero!(i % 5)) && i % 3 != 0 {
+LL | |             continue;
+LL | |         } else {
+LL | |             println!("Blabber");
+LL | |             println!("Jabber");
+LL | |         }
    | |_________^
    |
-   = help: Consider dropping the else clause, and moving out the code in the else block, like so:
-           if (zero!(i % 2) || nonzero!(i % 5)) && i % 3 != 0 {
-               continue;
-           }
-           println!("Blabber");
-           println!("Jabber");
-           ...
+   = help: consider dropping the `else` clause
+                   if (zero!(i % 2) || nonzero!(i % 5)) && i % 3 != 0 {
+                       continue;
+                   }
+                   {
+                       println!("Blabber");
+                       println!("Jabber");
+                   }
+
+error: this `else` block is redundant
+  --> $DIR/needless_continue.rs:100:24
+   |
+LL |                   } else {
+   |  ________________________^
+LL | |                     continue 'inner; // should lint here
+LL | |                 }
+   | |_________________^
+   |
+   = help: consider dropping the `else` clause and merging the code that follows (in the loop) with the `if` block
+                           if condition() {
+                               println!("bar-3");
+                               // merged code follows:
+                               println!("bar-4");
+                               update_condition();
+                               if condition() {
+                                   continue; // should lint here
+                               } else {
+                                   println!("bar-5");
+                               }
+                               println!("bar-6");
+                           }
+
+error: there is no need for an explicit `else` block for this `if` expression
+  --> $DIR/needless_continue.rs:106:17
+   |
+LL | /                 if condition() {
+LL | |                     continue; // should lint here
+LL | |                 } else {
+LL | |                     println!("bar-5");
+LL | |                 }
+   | |_________________^
+   |
+   = help: consider dropping the `else` clause
+                           if condition() {
+                               continue; // should lint here
+                           }
+                           {
+                               println!("bar-5");
+                           }
 
-error: aborting due to 2 previous errors
+error: aborting due to 4 previous errors