From 57dba240781a686ab0d9a0327c48e72020f2c690 Mon Sep 17 00:00:00 2001
From: Fabian Drinck <fabian.drinck@gmail.com>
Date: Sun, 10 Jul 2016 10:38:10 +0200
Subject: [PATCH 1/2] Fix issue-1049

---
 src/items.rs               | 9 ++++-----
 tests/source/issue-1049.rs | 6 ++++++
 tests/target/issue-1049.rs | 8 ++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 tests/source/issue-1049.rs
 create mode 100644 tests/target/issue-1049.rs

diff --git a/src/items.rs b/src/items.rs
index 1de56220cf4..cc2ad2b64a4 100644
--- a/src/items.rs
+++ b/src/items.rs
@@ -1359,8 +1359,9 @@ fn rewrite_fn_base(context: &RewriteContext,
             _ => {
                 // If we've already gone multi-line, or the return type would push
                 // over the max width, then put the return type on a new line.
-                result.contains("\n") || multi_line_ret_str ||
-                result.len() + indent.width() + ret_str_len > context.config.max_width
+                let overlong_ret = result.len() + indent.width() + ret_str_len >
+                                   context.config.max_width - 1;
+                result.contains("\n") || multi_line_ret_str || overlong_ret
             }
         };
         let ret_indent = if ret_should_indent {
@@ -1388,10 +1389,8 @@ fn rewrite_fn_base(context: &RewriteContext,
         if multi_line_ret_str {
             // Now that we know the proper indent and width, we need to
             // re-layout the return type.
-
             let budget = try_opt!(context.config.max_width.checked_sub(ret_indent.width()));
-            let ret_str = try_opt!(fd.output
-                .rewrite(context, budget, ret_indent));
+            let ret_str = try_opt!(fd.output.rewrite(context, budget, ret_indent));
             result.push_str(&ret_str);
         } else {
             result.push_str(&ret_str);
diff --git a/tests/source/issue-1049.rs b/tests/source/issue-1049.rs
new file mode 100644
index 00000000000..2d76cc489e2
--- /dev/null
+++ b/tests/source/issue-1049.rs
@@ -0,0 +1,6 @@
+// Test issue-1049
+pub unsafe fn reborrow_mut(&mut X: Abcde) -> Handle<NodeRef<marker::Mut, K, V, NodeType>, HandleType> {
+}
+
+pub fn merge(mut X: Abcdef) -> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Internal>, marker::Edge> {
+}
diff --git a/tests/target/issue-1049.rs b/tests/target/issue-1049.rs
new file mode 100644
index 00000000000..0529e861f69
--- /dev/null
+++ b/tests/target/issue-1049.rs
@@ -0,0 +1,8 @@
+// Test issue-1049
+pub unsafe fn reborrow_mut(&mut X: Abcde)
+                           -> Handle<NodeRef<marker::Mut, K, V, NodeType>, HandleType> {
+}
+
+pub fn merge(mut X: Abcdef)
+             -> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Internal>, marker::Edge> {
+}

From 53f1acb6d376b5cdcfecf77ad5ae3b73c06c52f4 Mon Sep 17 00:00:00 2001
From: Fabian Drinck <fabian.drinck@gmail.com>
Date: Sun, 10 Jul 2016 18:36:35 +0200
Subject: [PATCH 2/2] Fix issue-1048

---
 src/items.rs               | 3 ++-
 tests/source/issue-1048.rs | 3 +++
 tests/target/issue-1048.rs | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 tests/source/issue-1048.rs
 create mode 100644 tests/target/issue-1048.rs

diff --git a/src/items.rs b/src/items.rs
index cc2ad2b64a4..82f7dcfe711 100644
--- a/src/items.rs
+++ b/src/items.rs
@@ -440,6 +440,7 @@ pub fn format_impl(context: &RewriteContext, item: &ast::Item, offset: Indent) -
                                ref self_ty,
                                ref items) = item.node {
         let mut result = String::new();
+
         result.push_str(&*format_visibility(&item.vis));
         result.push_str(format_unsafety(unsafety));
         result.push_str("impl");
@@ -470,7 +471,7 @@ pub fn format_impl(context: &RewriteContext, item: &ast::Item, offset: Indent) -
             result.push_str(" for ");
         }
 
-        let budget = try_opt!(context.config.max_width.checked_sub(result.len()));
+        let budget = try_opt!(context.config.max_width.checked_sub(result.len() + 1));
         let indent = offset + result.len();
         result.push_str(&*try_opt!(self_ty.rewrite(context, budget, indent)));
 
diff --git a/tests/source/issue-1048.rs b/tests/source/issue-1048.rs
new file mode 100644
index 00000000000..40df8b81914
--- /dev/null
+++ b/tests/source/issue-1048.rs
@@ -0,0 +1,3 @@
+// Test issue-1048
+impl<BorrowType, K, V, NodeType, HandleType> Handle<NodeRef<BorrowType, K, V, NodeType>, HandleType> {
+}
diff --git a/tests/target/issue-1048.rs b/tests/target/issue-1048.rs
new file mode 100644
index 00000000000..af1be8aeab3
--- /dev/null
+++ b/tests/target/issue-1048.rs
@@ -0,0 +1,4 @@
+// Test issue-1048
+impl<BorrowType, K, V, NodeType, HandleType> Handle<NodeRef<BorrowType, K, V, NodeType>,
+                                                    HandleType> {
+}