Auto merge of #97191 - wesleywiser:main_thread_name, r=ChrisDenton

[rust.git] / src / tools / clippy / tests / ui / collapsible_else_if.stderr

diff --git a/src/tools/clippy/tests/ui/collapsible_else_if.stderr b/src/tools/clippy/tests/ui/collapsible_else_if.stderr
index ee3e11ae565d405435cafdbae0e27cf845698ee6..45b2094c9948b6961e4da37a27bc5ce631ccb56c 100644 (file)
--- a/src/tools/clippy/tests/ui/collapsible_else_if.stderr
+++ b/src/tools/clippy/tests/ui/collapsible_else_if.stderr
@@ -12,9 +12,9 @@ LL | |     }
    = note: `-D clippy::collapsible-else-if` implied by `-D warnings`
 help: collapse nested if block
    |
-LL |     } else if y == "world" {
-LL |         println!("world!")
-LL |     }
+LL ~     } else if y == "world" {
+LL +         println!("world!")
+LL +     }
    |
 
 error: this `else { if .. }` block can be collapsed
@@ -30,9 +30,9 @@ LL | |     }
    |
 help: collapse nested if block
    |
-LL |     } else if let Some(42) = Some(42) {
-LL |         println!("world!")
-LL |     }
+LL ~     } else if let Some(42) = Some(42) {
+LL +         println!("world!")
+LL +     }
    |
 
 error: this `else { if .. }` block can be collapsed
@@ -50,12 +50,12 @@ LL | |     }
    |
 help: collapse nested if block
    |
-LL |     } else if y == "world" {
-LL |         println!("world")
-LL |     }
-LL |     else {
-LL |         println!("!")
-LL |     }
+LL ~     } else if y == "world" {
+LL +         println!("world")
+LL +     }
+LL +     else {
+LL +         println!("!")
+LL +     }
    |
 
 error: this `else { if .. }` block can be collapsed
@@ -73,12 +73,12 @@ LL | |     }
    |
 help: collapse nested if block
    |
-LL |     } else if let Some(42) = Some(42) {
-LL |         println!("world")
-LL |     }
-LL |     else {
-LL |         println!("!")
-LL |     }
+LL ~     } else if let Some(42) = Some(42) {
+LL +         println!("world")
+LL +     }
+LL +     else {
+LL +         println!("!")
+LL +     }
    |
 
 error: this `else { if .. }` block can be collapsed
@@ -96,12 +96,12 @@ LL | |     }
    |
 help: collapse nested if block
    |
-LL |     } else if let Some(42) = Some(42) {
-LL |         println!("world")
-LL |     }
-LL |     else {
-LL |         println!("!")
-LL |     }
+LL ~     } else if let Some(42) = Some(42) {
+LL +         println!("world")
+LL +     }
+LL +     else {
+LL +         println!("!")
+LL +     }
    |
 
 error: this `else { if .. }` block can be collapsed
@@ -119,12 +119,12 @@ LL | |     }
    |
 help: collapse nested if block
    |
-LL |     } else if x == "hello" {
-LL |         println!("world")
-LL |     }
-LL |     else {
-LL |         println!("!")
-LL |     }
+LL ~     } else if x == "hello" {
+LL +         println!("world")
+LL +     }
+LL +     else {
+LL +         println!("!")
+LL +     }
    |
 
 error: this `else { if .. }` block can be collapsed
@@ -142,13 +142,22 @@ LL | |     }
    |
 help: collapse nested if block
    |
-LL |     } else if let Some(42) = Some(42) {
-LL |         println!("world")
-LL |     }
-LL |     else {
-LL |         println!("!")
-LL |     }
+LL ~     } else if let Some(42) = Some(42) {
+LL +         println!("world")
+LL +     }
+LL +     else {
+LL +         println!("!")
+LL +     }
    |
 
-error: aborting due to 7 previous errors
+error: this `else { if .. }` block can be collapsed
+  --> $DIR/collapsible_else_if.rs:97:10
+   |
+LL |       }else{
+   |  __________^
+LL | |         if false {}
+LL | |     }
+   | |_____^ help: collapse nested if block: `if false {}`
+
+error: aborting due to 8 previous errors