From 8e36d542024935eb805b1b082fb77d0700327aa7 Mon Sep 17 00:00:00 2001
From: Johannes Linke <johannes.linke@posteo.de>
Date: Sun, 18 Feb 2018 12:47:42 +0100
Subject: Fix #2346: empty comments should not have any trailing space added

---
 rustfmt-core/src/comment.rs             | 2 +-
 rustfmt-core/tests/target/issue-2346.rs | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 rustfmt-core/tests/target/issue-2346.rs

diff --git a/rustfmt-core/src/comment.rs b/rustfmt-core/src/comment.rs
index 512863c88be..67678f59074 100644
--- a/rustfmt-core/src/comment.rs
+++ b/rustfmt-core/src/comment.rs
@@ -466,7 +466,7 @@ fn rewrite_comment_inner(
     }
 
     result.push_str(closer);
-    if result == opener && result.ends_with(' ') {
+    if result.ends_with(opener) && opener.ends_with(' ') {
         // Trailing space.
         result.pop();
     }
diff --git a/rustfmt-core/tests/target/issue-2346.rs b/rustfmt-core/tests/target/issue-2346.rs
new file mode 100644
index 00000000000..07817221a51
--- /dev/null
+++ b/rustfmt-core/tests/target/issue-2346.rs
@@ -0,0 +1,4 @@
+// rustfmt-normalize_comments: true
+// the following empty comment should not have any trailing space added.
+//
+fn main() {}
-- 
cgit 1.4.1-3-g733a5