Use block when arm exceeds max_width

diff --git a/src/expr.rs b/src/expr.rs
index d64a9a75ad34ca7af9d7e2b8bc814a4982f0be49..25d9a1ed397c302dbc4fa51300aa0693b397b982 100644 (file)
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -1356,7 +1356,9 @@ fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
             };
 
             match rewrite {
-                Some(ref body_str) if !body_str.contains('\n') || !context.config.wrap_match_arms ||
+                Some(ref body_str) if (!body_str.contains('\n') &&
+                                       body_str.len() <= arm_shape.width) ||
+                                      !context.config.wrap_match_arms ||
                                       is_block => {
                     let block_sep = match context.config.control_brace_style {
                         ControlBraceStyle::AlwaysNextLine if is_block => alt_block_sep.as_str(),

diff --git a/tests/source/match.rs b/tests/source/match.rs
index 43b0b033ea6d3fbbde9739104eae303beda95319..3ed0f89ad7cabe7afbf2394636c2d0e76ace7c59 100644 (file)
--- a/tests/source/match.rs
+++ b/tests/source/match.rs
@@ -373,3 +373,10 @@ fn issue1456() {
         },
     })
 }
+
+fn issue1460() {
+    let _ = match foo {
+        REORDER_BUFFER_CHANGE_INTERNAL_SPEC_INSERT => "internal_spec_insert_internal_spec_insert_internal_spec_insert",
+        _ => "reorder_something",
+    };
+}

diff --git a/tests/target/match.rs b/tests/target/match.rs
index 0da943d28f78d9ba2aa5d40438d1345366b39133..2d0194f5613c3cb71b93ec2f48b3271dfc05ee78 100644 (file)
--- a/tests/target/match.rs
+++ b/tests/target/match.rs
@@ -389,3 +389,12 @@ fn issue1456() {
            },
        })
 }
+
+fn issue1460() {
+    let _ = match foo {
+        REORDER_BUFFER_CHANGE_INTERNAL_SPEC_INSERT => {
+            "internal_spec_insert_internal_spec_insert_internal_spec_insert"
+        }
+        _ => "reorder_something",
+    };
+}