tests/source/let_else.rs

@@ -2,9 +2,14 @@ fn main() {
     // Although this won't compile it still parses so make sure we can format empty else blocks
     let Some(x) = opt else {};
 
-    // let-else may be formatted on a single line if they are "short" and only contain a single expression
+    // let-else may be formatted on a single line if they are "short"
+    // and only contain a single expression
     let Some(x) = opt else { return };
 
+    let Some(x) = opt else {
+        return
+    };
+
     let Some(x) = opt else { return; };
 
     let Some(x) = opt else {
@@ -125,3 +130,18 @@ fn unbreakable_initializer_expr_pre_formatting_length_through_initializer_expr_n
     // because the Shape is accounting for the `;` at the end of the `let-else` statement.
     let Some(x) = some_really_really_really_really_really_really_really_really_really_really_really_long_nameJ else {return};
 }
+
+fn long_patterns() {
+    let Foo {x: Bar(..), y: FooBar(..), z: Baz(..)} = opt else {
+        return;
+    };
+
+    // with version=One we don't wrap long array patterns
+    let [aaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbb, cccccccccccccccccc, dddddddddddddddddd] = opt else {
+        return;
+    };
+
+    let Some(Ok((Message::ChangeColor(super::color::Color::Rgb(r, g, b)), Point { x, y, z }))) = opt else {
+        return;
+    };
+}

tests/target/let_else.rs

@@ -2,7 +2,10 @@ fn main() {
     // Although this won't compile it still parses so make sure we can format empty else blocks
     let Some(x) = opt else {};
 
-    // let-else may be formatted on a single line if they are "short" and only contain a single expression
+    // let-else may be formatted on a single line if they are "short"
+    // and only contain a single expression
+    let Some(x) = opt else { return };
+
     let Some(x) = opt else { return };
 
     let Some(x) = opt else {
@@ -192,3 +195,25 @@ fn unbreakable_initializer_expr_pre_formatting_length_through_initializer_expr_n
     // because the Shape is accounting for the `;` at the end of the `let-else` statement.
     let Some(x) = some_really_really_really_really_really_really_really_really_really_really_really_long_nameJ else {return};
 }
+
+fn long_patterns() {
+    let Foo {
+        x: Bar(..),
+        y: FooBar(..),
+        z: Baz(..),
+    } = opt
+    else {
+        return;
+    };
+
+    // with version=One we don't wrap long array patterns
+    let [aaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbb, cccccccccccccccccc, dddddddddddddddddd] = opt else {
+        return;
+    };
+
+    let Some(Ok((Message::ChangeColor(super::color::Color::Rgb(r, g, b)), Point { x, y, z }))) =
+        opt
+    else {
+        return;
+    };
+}