Correct doc comment indentation for struct fields

Fix https://github.com/rust-lang-nursery/rustfmt/issues/572.

diff --git a/src/items.rs b/src/items.rs
index 19aec73f1165942fbdd4cc8509e24739c6f897a8..d69e186665402e3dbaf4f72566c3b49c61b13f9d 100644 (file)
--- a/src/items.rs
+++ b/src/items.rs
@@ -1195,15 +1195,14 @@ fn rewrite(&self, context: &RewriteContext, width: usize, offset: Indent) -> Opt
             ast::StructFieldKind::NamedField(_, vis) |
             ast::StructFieldKind::UnnamedField(vis) => format_visibility(vis),
         };
-        let indent = context.block_indent.block_indent(context.config);
         let mut attr_str = try_opt!(self.node
                                         .attrs
                                         .rewrite(context,
-                                                 context.config.max_width - indent.width(),
-                                                 indent));
+                                                 context.config.max_width - offset.width(),
+                                                 offset));
         if !attr_str.is_empty() {
             attr_str.push('\n');
-            attr_str.push_str(&indent.to_string(context.config));
+            attr_str.push_str(&offset.to_string(context.config));
         }
 
         let result = match name {

diff --git a/src/lists.rs b/src/lists.rs
index ecde4f19fe44bb3218cda74b0ac98add9cd5a0a8..5bd2845c0e51edc2641dd3c298e8339e8d3bcda3 100644 (file)
--- a/src/lists.rs
+++ b/src/lists.rs
@@ -14,7 +14,6 @@
 use syntax::codemap::{self, CodeMap, BytePos};
 
 use Indent;
-use utils::wrap_str;
 use comment::{FindUncommented, rewrite_comment, find_comment_end};
 use config::Config;
 
@@ -280,12 +279,7 @@ pub fn write_list<'b, I, T>(items: I, formatting: &ListFormatting<'b>) -> Option
             }
         }
 
-        // Make sure that string actually fits.
-        let item_str = try_opt!(wrap_str(&inner_item[..],
-                                         formatting.config.max_width,
-                                         formatting.width,
-                                         formatting.indent));
-        result.push_str(&item_str);
+        result.push_str(&inner_item[..]);
 
         // Post-comments
         if tactic != DefinitiveListTactic::Vertical && item.post_comment.is_some() {

diff --git a/tests/source/structs.rs b/tests/source/structs.rs
index 9a559e029db2dbbe93d24ad13ca700a4205d38dd..6d7f6213eca7a845ae9e38e58b4ab7febfe67933 100644 (file)
--- a/tests/source/structs.rs
+++ b/tests/source/structs.rs
@@ -141,3 +141,7 @@ struct X<T> where T: Sized {
         a: T,
     }
 }
+
+struct Foo<T>(TTTTTTTTTTTTTTTTTTT,
+              /// Qux
+    UUUUUUUUUUUUUUUUUUU);

diff --git a/tests/target/imports.rs b/tests/target/imports.rs
index 948b6da7c2bdc898b32e845e92268a2f803643bb..296230ef8ba8cd5af54327a06df55f37a83ab866 100644 (file)
--- a/tests/target/imports.rs
+++ b/tests/target/imports.rs
@@ -2,7 +2,8 @@
 
 // Long import.
 use syntax::ast::{ItemForeignMod, ItemImpl, ItemMac, ItemMod, ItemStatic, ItemDefaultImpl};
-use exceedingly::looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong::import::path::{ItemA, ItemB};
+use exceedingly::looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong::import::path::{ItemA,
+                                                                                                ItemB};
 use exceedingly::loooooooooooooooooooooooooooooooooooooooooooooooooooooooong::import::path::{ItemA,
                                                                                              ItemB};
 

diff --git a/tests/target/structs.rs b/tests/target/structs.rs
index 50090b7a5f4c17d914e620c74d8db25d98dc35e5..9e17dec1411db65fdbe524f2729163e5d7df2b7f 100644 (file)
--- a/tests/target/structs.rs
+++ b/tests/target/structs.rs
@@ -149,3 +149,7 @@ struct X<T>
         a: T,
     }
 }
+
+struct Foo<T>(TTTTTTTTTTTTTTTTTTT,
+              /// Qux
+              UUUUUUUUUUUUUUUUUUU);