From: topecongiro <seuchida@gmail.com>
Date: Thu, 15 Feb 2018 07:41:47 +0000 (+0900)
Subject: Preserve two or more trailing spaces in doc comment
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=6f38a4aeab697dd6d52ca4cdcdec6d7d03c960f2;p=rust.git

Preserve two or more trailing spaces in doc comment

rustdoc treats two or more trailing spaces as a line break.
---

diff --git a/rustfmt-core/src/comment.rs b/rustfmt-core/src/comment.rs
index 523282396d0..dc0c59a617e 100644
--- a/rustfmt-core/src/comment.rs
+++ b/rustfmt-core/src/comment.rs
@@ -508,11 +508,9 @@ pub fn recover_missing_comment_in_span(
     }
 }
 
-/// Trim trailing whitespaces unless they consist of two whitespaces.
+/// Trim trailing whitespaces unless they consist of two or more whitespaces.
 fn trim_right_unless_two_whitespaces(s: &str, is_doc_comment: bool) -> &str {
-    if is_doc_comment && s.ends_with("  ")
-        && !s.chars().rev().nth(2).map_or(true, char::is_whitespace)
-    {
+    if is_doc_comment && s.ends_with("  ") {
         s
     } else {
         s.trim_right()
@@ -541,7 +539,7 @@ fn light_rewrite_comment(
             } else {
                 ""
             };
-            // Preserve markdown's double-space line break syntax.
+            // Preserve markdown's double-space line break syntax in doc comment.
             trim_right_unless_two_whitespaces(left_trimmed, is_doc_comment)
         })
         .collect();
diff --git a/rustfmt-core/tests/source/markdown-comment.rs b/rustfmt-core/tests/source/markdown-comment.rs
index c3633141ba5..1ec26562fe2 100644
--- a/rustfmt-core/tests/source/markdown-comment.rs
+++ b/rustfmt-core/tests/source/markdown-comment.rs
@@ -4,7 +4,7 @@
 //! hello world  
 //! hello world 
 
-/// hello world  
+/// hello world    
 /// hello world 
 /// hello world  
 fn foo() {
diff --git a/rustfmt-core/tests/target/markdown-comment.rs b/rustfmt-core/tests/target/markdown-comment.rs
index 5c4c413bddf..71a9921d286 100644
--- a/rustfmt-core/tests/target/markdown-comment.rs
+++ b/rustfmt-core/tests/target/markdown-comment.rs
@@ -4,7 +4,7 @@
 //! hello world  
 //! hello world
 
-/// hello world  
+/// hello world    
 /// hello world
 /// hello world  
 fn foo() {