Update needless_continue stderr

clippy_lints/src/utils/mod.rs

@@ -654,7 +654,7 @@ pub fn expr_block<'a, T: LintContext>(
 
 /// Trim indentation from a multiline string with possibility of ignoring the
 /// first line.
-pub fn trim_multiline(s: Cow<'_, str>, ignore_first: bool, indent: Option<usize>) -> Cow<'_, str> {
+fn trim_multiline(s: Cow<'_, str>, ignore_first: bool, indent: Option<usize>) -> Cow<'_, str> {
     let s_space = trim_multiline_inner(s, ignore_first, indent, ' ');
     let s_tab = trim_multiline_inner(s_space, ignore_first, indent, '\t');
     trim_multiline_inner(s_tab, ignore_first, indent, ' ')

tests/ui/needless_continue.stderr

@@ -1,5 +1,4 @@
-error: This `else` block is redundant.
+error: this `else` block is redundant
-
   --> $DIR/needless_continue.rs:28:16
    |
 LL |           } else {
@@ -9,7 +8,7 @@ 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:
+   = 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);
@@ -18,7 +17,8 @@ LL | |         }
                        }
                        let i = 0;
                        println!("bar {} ", i);
-           // Merged code follows...println!("bleh");
+                       // merged code follows:
+                       println!("bleh");
                        {
                            println!("blah");
                        }
@@ -34,9 +34,7 @@ LL | |         }
                        println!("bleh");
                    }
 
-
+error: there is no need for an explicit `else` block for this `if` expression
-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 {
@@ -47,16 +45,15 @@ LL | |             println!("Jabber");
 LL | |         }
    | |_________^
    |
-   = help: Consider dropping the `else` clause, and moving out the code in the `else` block, like so:
+   = 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.
 
+error: this `else` block is redundant
   --> $DIR/needless_continue.rs:100:24
    |
 LL |                   } else {
@@ -65,10 +62,11 @@ 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, like so:
+   = 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");
+                               // merged code follows:
+                               println!("bar-4");
                                update_condition();
                                if condition() {
                                    continue; // should lint here
@@ -78,9 +76,7 @@ LL | |                 }
                                println!("bar-6");
                            }
 
-
+error: there is no need for an explicit `else` block for this `if` expression
-error: There is no need for an explicit `else` block for this `if` expression
-
   --> $DIR/needless_continue.rs:106:17
    |
 LL | /                 if condition() {
@@ -90,12 +86,12 @@ LL | |                     println!("bar-5");
 LL | |                 }
    | |_________________^
    |
-   = help: Consider dropping the `else` clause, and moving out the code in the `else` block, like so:
+   = help: consider dropping the `else` clause
                            if condition() {
-               continue;
+                               continue; // should lint here
-           }
+                           } {
                                println!("bar-5");
-           ...
+                           }
 
 error: aborting due to 4 previous errors