Merge pull request #2019 from topecongiro/issue-2018

Break after '=' if a single line rhs exceeds max width

src/expr.rs

@@ -2882,7 +2882,7 @@ pub fn rewrite_assign_rhs<S: Into<String>>(
     let rhs = try_opt!(choose_rhs(
         context,
         ex,
-        shape,
+        orig_shape,
         ex.rewrite(context, orig_shape)
     ));
     Some(lhs + &rhs)
@@ -2895,7 +2895,9 @@ fn choose_rhs(
     orig_rhs: Option<String>,
 ) -> Option<String> {
     match orig_rhs {
-        Some(ref new_str) if !new_str.contains('\n') => Some(format!(" {}", new_str)),
+        Some(ref new_str) if !new_str.contains('\n') && new_str.len() <= shape.width => {
+            Some(format!(" {}", new_str))
+        }
         _ => {
             // Expression did not fit on the same line as the identifier.
             // Try splitting the line and see if that works better.

tests/source/assignment.rs

@@ -25,3 +25,6 @@ fn break_meee() {
             };
     }
 }
+
+// #2018
+pub const EXPLAIN_UNSIZED_TUPLE_COERCION: &'static str = "Unsized tuple coercion is not stable enough for use and is subject to change";

tests/target/assignment.rs

@@ -30,3 +30,7 @@ fn break_meee() {
         };
     }
 }
+
+// #2018
+pub const EXPLAIN_UNSIZED_TUPLE_COERCION: &'static str =
+    "Unsized tuple coercion is not stable enough for use and is subject to change";

tests/target/configs-force_format_strings-false.rs

@@ -5,5 +5,6 @@
 // Force format strings
 
 fn main() {
-    let lorem = "ipsum dolor sit amet consectetur adipiscing elit lorem ipsum dolor sit";
+    let lorem =
+        "ipsum dolor sit amet consectetur adipiscing elit lorem ipsum dolor sit";
 }

tests/target/configs-format_strings-false.rs

@@ -4,5 +4,6 @@
 // Force format strings
 
 fn main() {
-    let lorem = "ipsum dolor sit amet consectetur adipiscing elit lorem ipsum dolor sit";
+    let lorem =
+        "ipsum dolor sit amet consectetur adipiscing elit lorem ipsum dolor sit";
 }

tests/target/hard-tabs.rs

@@ -19,7 +19,8 @@ fn main() {
 	fn foo(a: i32, a: i32, a: i32, a: i32, a: i32, a: i32, a: i32, a: i32, a: i32, a: i32, a: i32) {
 	}
 
-	let str = "AAAAAAAAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAa";
+	let str =
+		"AAAAAAAAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAa";
 
 	if let (
 		some_very_large,