From a1d94e545cb070212f6a8d09ef584e87b0c4b35a Mon Sep 17 00:00:00 2001
From: Nick Cameron <ncameron@mozilla.com>
Date: Fri, 10 Mar 2017 15:58:35 +1300
Subject: [PATCH] Attempt to fixup impls with long generics

---
 src/items.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/items.rs b/src/items.rs
index 5d1e034b389..6bb30425073 100644
--- a/src/items.rs
+++ b/src/items.rs
@@ -527,7 +527,7 @@ pub fn format_impl(context: &RewriteContext, item: &ast::Item, offset: Indent) -
                                                              context.config.where_density,
                                                              "{",
                                                              false,
-                                                             false,
+                                                             last_line_width(&ref_and_type) == 1,
                                                              None));
 
         if try_opt!(is_impl_single_line(context, &items, &result, &where_clause_str, &item)) {
@@ -626,7 +626,7 @@ fn format_impl_ref_and_type(context: &RewriteContext,
         item.node {
         let mut result = String::new();
 
-        result.push_str(&*format_visibility(&item.vis));
+        result.push_str(&format_visibility(&item.vis));
         result.push_str(format_unsafety(unsafety));
         result.push_str("impl");
 
@@ -650,8 +650,9 @@ fn format_impl_ref_and_type(context: &RewriteContext,
             if polarity != ast::ImplPolarity::Negative {
                 result.push_str(" ");
             }
-            let budget = try_opt!(context.config.max_width.checked_sub(result.len()));
-            let indent = offset + result.len();
+            let used_space = last_line_width(&result);
+            let budget = try_opt!(context.config.max_width.checked_sub(used_space));
+            let indent = offset + used_space;
             result.push_str(&*try_opt!(trait_ref.rewrite(context, Shape::legacy(budget, indent))));
 
             if split_at_for {
@@ -1119,7 +1120,7 @@ pub fn rewrite_type_alias(context: &RewriteContext,
                                                          context.config.where_density,
                                                          "=",
                                                          true,
-                                                         false,
+                                                         true,
                                                          Some(span.hi)));
     result.push_str(&where_clause_str);
     result.push_str(" = ");