Use block indent style for struct tuple

diff --git a/src/items.rs b/src/items.rs
index 0e8c10ea1815cefbfa08bd0c584c4544dfdb7292..f113dee2c0ce92ba7801944e71769f120d713dcb 100644 (file)
--- a/src/items.rs
+++ b/src/items.rs
@@ -15,8 +15,8 @@
 use utils::{format_mutability, format_visibility, contains_skip, end_typaram, wrap_str,
             last_line_width, format_unsafety, trim_newlines, stmt_expr, semicolon_for_expr,
             trimmed_last_line_width, colon_spaces, mk_sp};
-use lists::{write_list, itemize_list, ListItem, ListFormatting, SeparatorTactic, list_helper,
-            DefinitiveListTactic, ListTactic, definitive_tactic};
+use lists::{write_list, itemize_list, definitive_tactic, ListItem, ListFormatting,
+            SeparatorTactic, DefinitiveListTactic, ListTactic};
 use expr::{format_expr, is_empty_block, is_simple_block_stmt, rewrite_assign_rhs, ExprType};
 use comment::{FindUncommented, contains_comment, rewrite_comment, recover_comment_removed};
 use visitor::FmtVisitor;
@@ -1152,12 +1152,11 @@ fn format_tuple_struct(
             let generics_str = try_opt!(rewrite_generics(context, generics, shape, g_span));
             result.push_str(&generics_str);
 
-            let where_budget = try_opt!(
-                context
-                    .config
-                    .max_width()
-                    .checked_sub(last_line_width(&result))
-            );
+            let where_budget = context
+                .config
+                .max_width()
+                .checked_sub(last_line_width(&result))
+                .unwrap_or(0);
             try_opt!(rewrite_where_clause(
                 context,
                 &generics.where_clause,
@@ -1197,7 +1196,11 @@ fn format_tuple_struct(
             }
             IndentStyle::Block => {
                 (
-                    ListTactic::HorizontalVertical,
+                    if result.contains('\n') {
+                        ListTactic::Vertical
+                    } else {
+                        ListTactic::HorizontalVertical
+                    },
                     offset.block_only().block_indent(&context.config),
                 )
             }
@@ -1233,15 +1236,20 @@ fn format_tuple_struct(
             context
                 .config
                 .max_width()
-                .checked_sub(offset.block_only().width() + result.len() + 3)
+                .checked_sub(offset.block_only().width() + last_line_width(&result) + 3)
         );
-        let body = try_opt!(list_helper(
-            items,
-            // TODO budget is wrong in block case
-            Shape::legacy(body_budget, item_indent),
-            context.config,
-            tactic,
-        ));
+
+        let item_vec: Vec<_> = items.collect();
+        let tactic = definitive_tactic(&item_vec, tactic, body_budget);
+        let fmt = ListFormatting {
+            tactic: tactic,
+            separator: ",",
+            trailing_separator: context.config.trailing_comma(),
+            shape: Shape::indented(item_indent, context.config),
+            ends_with_newline: false,
+            config: context.config,
+        };
+        let body = try_opt!(write_list(&item_vec, &fmt));
 
         if context.config.fn_args_layout() == IndentStyle::Visual || !body.contains('\n') {
             result.push('(');

diff --git a/tests/target/enum.rs b/tests/target/enum.rs
index 6ff1750ae015ae8fa606486f4311c7653ea7f69a..14b9910687d00c670a8a383540f6f5a94f5081ac 100644 (file)
--- a/tests/target/enum.rs
+++ b/tests/target/enum.rs
@@ -32,7 +32,7 @@ enum Bar {
 enum LongVariants {
     First(
         LOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG, // comment
-        VARIANT
+        VARIANT,
     ),
     // This is the second variant
     Second,
@@ -53,7 +53,7 @@ enum X {
     CreateWebGLPaintTask(
         Size2D<i32>,
         GLContextAttributes,
-        IpcSender<Result<(IpcSender<CanvasMsg>, usize), String>>
+        IpcSender<Result<(IpcSender<CanvasMsg>, usize), String>>,
     ), // This is a post comment
 }
 
@@ -120,7 +120,7 @@ enum TestEnum {
                 usize,
                 usize,
                 usize,
-                usize
+                usize,
             ), /* AAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAA
                 * AAAAAAAAAAAAAAAAAAAAAA */
             Two, /* AAAAAAAAAAAAAAAAAA  AAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -155,6 +155,6 @@ pub enum CoreResourceMsg {
         #[serde(deserialize_with = "::hyper_serde::deserialize",
                 serialize_with = "::hyper_serde::serialize")]
         Cookie,
-        CookieSource
+        CookieSource,
     ),
 }

diff --git a/tests/target/structs.rs b/tests/target/structs.rs
index 541abd36c7c2c77797259ff1b21caabf3bb4c8a0..c525c5878454f2486924b139d57d63be76189e05 100644 (file)
--- a/tests/target/structs.rs
+++ b/tests/target/structs.rs
@@ -43,12 +43,13 @@ pub struct Writebatch<K: Key> {
 
 struct NewInt<T: Copy>(pub i32, SomeType /* inline comment */, T /* sup */);
 
-struct Qux<'a,
-           N: Clone + 'a,
-           E: Clone + 'a,
-           G: Labeller<'a, N, E> + GraphWalk<'a, N, E>,
-           W: Write + Copy>
-(
+struct Qux<
+    'a,
+    N: Clone + 'a,
+    E: Clone + 'a,
+    G: Labeller<'a, N, E> + GraphWalk<'a, N, E>,
+    W: Write + Copy,
+>(
     AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA, // Comment
     BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB,
     #[AnAttr]
@@ -62,7 +63,7 @@ struct Tuple(
     // Comment 1
     AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,
     // Comment 2
-    BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
+    BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB,
 );
 
 // With a where clause and generics.
@@ -154,7 +155,7 @@ struct Foo<T>(
     TTTTTTTTTTTTTTTTT,
     UUUUUUUUUUUUUUUUUUUUUUUU,
     TTTTTTTTTTTTTTTTTTT,
-    UUUUUUUUUUUUUUUUUUU
+    UUUUUUUUUUUUUUUUUUU,
 );
 struct Foo<T>(TTTTTTTTTTTTTTTTTT, UUUUUUUUUUUUUUUUUUUUUUUU, TTTTTTTTTTTTTTTTTTT)
 where
@@ -166,7 +167,7 @@ struct Foo<T>(
     TTTTTTTTTTTTTTTTT,
     UUUUUUUUUUUUUUUUUUUUUUUU,
     TTTTTTTTTTTTTTTTTTT,
-    UUUUUUUUUUUUUUUUUUU
+    UUUUUUUUUUUUUUUUUUU,
 )
 where
     T: PartialEq;
@@ -176,7 +177,7 @@ struct Foo<T>(
     // Baz
     TTTTTTTTTTTTTTTTTTT,
     // Qux (FIXME #572 - doc comment)
-    UUUUUUUUUUUUUUUUUUU
+    UUUUUUUUUUUUUUUUUUU,
 );
 
 mod m {
@@ -191,7 +192,7 @@ struct X<T>
 struct Foo<T>(
     TTTTTTTTTTTTTTTTTTT,
     /// Qux
-    UUUUUUUUUUUUUUUUUUU
+    UUUUUUUUUUUUUUUUUUU,
 );
 
 struct Issue677 {

diff --git a/tests/target/trailing_commas.rs b/tests/target/trailing_commas.rs
index c5e6b9525b49b6a4ba11154ea0d05b2f46246e75..4c4dedd59a04d1bd79da88a0ec65cb70e54d6a60 100644 (file)
--- a/tests/target/trailing_commas.rs
+++ b/tests/target/trailing_commas.rs
@@ -48,7 +48,10 @@ struct Pair<
 
 struct TupPair<
     S, T,
->(S, T)
+>(
+    S,
+    T,
+)
 where
     T: P,
     S: P + Q;