From 96f3c36c0479121c6cb4a48496f117e85997ba65 Mon Sep 17 00:00:00 2001
From: topecongiro <seuchida@gmail.com>
Date: Mon, 13 Nov 2017 16:09:59 +0900
Subject: [PATCH] Replace '_indent' with 'indent_style'

---
 tests/config/small_tabs.toml                              | 5 +----
 tests/source/big-impl-rfc.rs                              | 5 +----
 tests/source/closure-block-inside-macro.rs                | 2 +-
 ...nfigs-array_horizontal_layout_threshold-1000-visual.rs | 2 +-
 tests/source/configs-array_indent-block.rs                | 2 +-
 tests/source/configs-array_indent-visual.rs               | 2 +-
 tests/source/configs-fn_args_indent-block.rs              | 2 +-
 tests/source/configs-fn_args_indent-visual.rs             | 2 +-
 .../source/configs-fn_call_indent-block-trailing-comma.rs | 2 +-
 tests/source/configs-fn_call_indent-block.rs              | 2 +-
 .../configs-fn_call_indent-visual-trailing-comma.rs       | 2 +-
 tests/source/configs-fn_call_indent-visual.rs             | 2 +-
 tests/source/configs-fn_call_width-zero.rs                | 2 +-
 tests/source/configs-generics_indent-block.rs             | 2 +-
 tests/source/configs-generics_indent-visual.rs            | 2 +-
 tests/source/configs-struct_lit_indent-block.rs           | 2 +-
 tests/source/configs-struct_lit_indent-visual.rs          | 2 +-
 tests/source/configs-tab_spaces-2.rs                      | 2 +-
 tests/source/configs-tab_spaces-4.rs                      | 2 +-
 tests/source/configs-where_pred_indent-block.rs           | 2 +-
 tests/source/configs-where_pred_indent-visual.rs          | 2 +-
 tests/source/configs-where_style-default.rs               | 2 +-
 tests/source/configs-where_style-rfc.rs                   | 2 +-
 tests/source/expr-block.rs                                | 4 +---
 tests/source/fn-custom-2.rs                               | 3 +--
 tests/source/fn-custom-3.rs                               | 3 +--
 tests/source/fn-custom-4.rs                               | 2 +-
 tests/source/fn-custom-6.rs                               | 2 +-
 tests/source/fn-custom-7.rs                               | 2 +-
 tests/source/fn-custom-8.rs                               | 2 +-
 tests/source/fn_args_indent-block.rs                      | 2 +-
 tests/source/issue-1278.rs                                | 2 +-
 tests/source/struct_lits_visual.rs                        | 2 +-
 tests/source/struct_lits_visual_multiline.rs              | 2 +-
 tests/source/struct_tuple_visual.rs                       | 2 +-
 tests/source/where-clause-rfc.rs                          | 3 +--
 tests/target/big-impl-rfc.rs                              | 8 ++++----
 tests/target/closure-block-inside-macro.rs                | 2 +-
 ...nfigs-array_horizontal_layout_threshold-1000-visual.rs | 2 +-
 tests/target/configs-array_indent-block.rs                | 2 +-
 tests/target/configs-array_indent-visual.rs               | 2 +-
 tests/target/configs-combine_control_expr-false.rs        | 2 +-
 tests/target/configs-combine_control_expr-true.rs         | 2 +-
 tests/target/configs-control_style-rfc.rs                 | 2 +-
 tests/target/configs-fn_args_indent-block.rs              | 2 +-
 tests/target/configs-fn_args_indent-visual.rs             | 2 +-
 tests/target/configs-fn_call_indent-block-tab_spaces-2.rs | 2 +-
 .../target/configs-fn_call_indent-block-trailing-comma.rs | 2 +-
 tests/target/configs-fn_call_indent-block.rs              | 2 +-
 .../configs-fn_call_indent-visual-trailing-comma.rs       | 2 +-
 tests/target/configs-fn_call_indent-visual.rs             | 2 +-
 tests/target/configs-fn_call_width-zero.rs                | 2 +-
 tests/target/configs-generics_indent-block.rs             | 2 +-
 tests/target/configs-generics_indent-visual.rs            | 2 +-
 tests/target/configs-imports_indent-block.rs              | 2 +-
 .../target/configs-imports_layout-horizontal_vertical.rs  | 2 +-
 tests/target/configs-imports_layout-mixed.rs              | 2 +-
 tests/target/configs-struct_lit_indent-block.rs           | 2 +-
 tests/target/configs-struct_lit_indent-visual.rs          | 2 +-
 tests/target/configs-tab_spaces-2.rs                      | 2 +-
 tests/target/configs-tab_spaces-4.rs                      | 2 +-
 tests/target/configs-where_pred_indent-block.rs           | 2 +-
 tests/target/configs-where_pred_indent-visual.rs          | 2 +-
 tests/target/configs-where_style-default.rs               | 2 +-
 tests/target/configs-where_style-rfc.rs                   | 2 +-
 tests/target/expr-block.rs                                | 4 +---
 tests/target/fn-custom-2.rs                               | 3 +--
 tests/target/fn-custom-3.rs                               | 3 +--
 tests/target/fn-custom-4.rs                               | 2 +-
 tests/target/fn-custom-6.rs                               | 2 +-
 tests/target/fn-custom-7.rs                               | 2 +-
 tests/target/fn-custom-8.rs                               | 2 +-
 tests/target/fn_args_indent-block.rs                      | 2 +-
 tests/target/issue-1278.rs                                | 2 +-
 tests/target/issue-1624.rs                                | 2 +-
 tests/target/struct_lits_visual.rs                        | 2 +-
 tests/target/struct_lits_visual_multiline.rs              | 2 +-
 tests/target/struct_tuple_visual.rs                       | 2 +-
 tests/target/where-clause-rfc.rs                          | 3 +--
 79 files changed, 82 insertions(+), 98 deletions(-)

diff --git a/tests/config/small_tabs.toml b/tests/config/small_tabs.toml
index d48810bd578..264591bc400 100644
--- a/tests/config/small_tabs.toml
+++ b/tests/config/small_tabs.toml
@@ -6,13 +6,10 @@ fn_brace_style = "SameLineWhere"
 fn_return_indent = "WithArgs"
 fn_args_paren_newline = true
 fn_args_density = "Tall"
-fn_args_indent = "Visual"
 where_density = "Tall"
 where_layout = "Vertical"
-where_pred_indent = "Visual"
-generics_indent = "Visual"
 trailing_comma = "Vertical"
-struct_lit_indent = "Block"
+indent_style = "Block"
 report_todo = "Always"
 report_fixme = "Never"
 reorder_imports = false
diff --git a/tests/source/big-impl-rfc.rs b/tests/source/big-impl-rfc.rs
index 86812fd5379..737dd5aeb6a 100644
--- a/tests/source/big-impl-rfc.rs
+++ b/tests/source/big-impl-rfc.rs
@@ -1,7 +1,4 @@
-// rustfmt-fn_args_indent: Block
-// rustfmt-fn_call_indent: Block
-// rustfmt-generics_indent: Block
-// rustfmt-where_style: Rfc
+// rustfmt-indent_style: Block
 
 // #1357
 impl<
diff --git a/tests/source/closure-block-inside-macro.rs b/tests/source/closure-block-inside-macro.rs
index 2f7e04957e9..c1260592083 100644
--- a/tests/source/closure-block-inside-macro.rs
+++ b/tests/source/closure-block-inside-macro.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_call_indent: Block
+// rustfmt-indent_style: Block
 
 // #1547
 fuzz_target!(|data: &[u8]| if let Some(first) = data.first() {
diff --git a/tests/source/configs-array_horizontal_layout_threshold-1000-visual.rs b/tests/source/configs-array_horizontal_layout_threshold-1000-visual.rs
index 84cfb06bced..3036f3598ef 100644
--- a/tests/source/configs-array_horizontal_layout_threshold-1000-visual.rs
+++ b/tests/source/configs-array_horizontal_layout_threshold-1000-visual.rs
@@ -1,5 +1,5 @@
 // rustfmt-array_horizontal_layout_threshold: 1000
-// rustfmt-array_indent: Visual
+// rustfmt-indent_style: Visual
 
 const ARRAY: [u8; 2048] =
     [99, 72, 48, 104, 44, 112, 38, 62, 40, 93, 23, 24, 32, 21, 102, 76, 65, 29, 116,
diff --git a/tests/source/configs-array_indent-block.rs b/tests/source/configs-array_indent-block.rs
index 7aefa36c187..8404f65f471 100644
--- a/tests/source/configs-array_indent-block.rs
+++ b/tests/source/configs-array_indent-block.rs
@@ -1,4 +1,4 @@
-// rustfmt-array_indent: Block
+// rustfmt-indent_style: Block
 // Array layout
 
 fn main() {
diff --git a/tests/source/configs-array_indent-visual.rs b/tests/source/configs-array_indent-visual.rs
index f448e9607d7..05bbf00b1d2 100644
--- a/tests/source/configs-array_indent-visual.rs
+++ b/tests/source/configs-array_indent-visual.rs
@@ -1,4 +1,4 @@
-// rustfmt-array_indent: Visual
+// rustfmt-indent_style: Visual
 // Array layout
 
 fn main() {
diff --git a/tests/source/configs-fn_args_indent-block.rs b/tests/source/configs-fn_args_indent-block.rs
index 169a538d70d..4d2d280a16b 100644
--- a/tests/source/configs-fn_args_indent-block.rs
+++ b/tests/source/configs-fn_args_indent-block.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_indent: Block
+// rustfmt-indent_style: Block
 // Function arguments layout
 
 fn lorem() {}
diff --git a/tests/source/configs-fn_args_indent-visual.rs b/tests/source/configs-fn_args_indent-visual.rs
index adc1466bffc..5aa28a62b9c 100644
--- a/tests/source/configs-fn_args_indent-visual.rs
+++ b/tests/source/configs-fn_args_indent-visual.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_indent: Visual
+// rustfmt-indent_style: Visual
 // Function arguments layout
 
 fn lorem() {}
diff --git a/tests/source/configs-fn_call_indent-block-trailing-comma.rs b/tests/source/configs-fn_call_indent-block-trailing-comma.rs
index 9d948594d8b..c907ec50d45 100644
--- a/tests/source/configs-fn_call_indent-block-trailing-comma.rs
+++ b/tests/source/configs-fn_call_indent-block-trailing-comma.rs
@@ -1,5 +1,5 @@
 // rustfmt-error_on_line_overflow: false
-// rustfmt-fn_call_indent: Block
+// rustfmt-indent_style: Block
 
 // rustfmt should not add trailing comma when rewriting macro. See #1528.
 fn a() {
diff --git a/tests/source/configs-fn_call_indent-block.rs b/tests/source/configs-fn_call_indent-block.rs
index 76ccb001595..c82b6b8e38f 100644
--- a/tests/source/configs-fn_call_indent-block.rs
+++ b/tests/source/configs-fn_call_indent-block.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_call_indent: Block
+// rustfmt-indent_style: Block
 // Function call style
 
 fn main() {
diff --git a/tests/source/configs-fn_call_indent-visual-trailing-comma.rs b/tests/source/configs-fn_call_indent-visual-trailing-comma.rs
index d6d1a86a631..9738d397dbf 100644
--- a/tests/source/configs-fn_call_indent-visual-trailing-comma.rs
+++ b/tests/source/configs-fn_call_indent-visual-trailing-comma.rs
@@ -1,5 +1,5 @@
 // rustfmt-error_on_line_overflow: false
-// rustfmt-fn_call_indent: Visual
+// rustfmt-indent_style: Visual
 
 // rustfmt should not add trailing comma when rewriting macro. See #1528.
 fn a() {
diff --git a/tests/source/configs-fn_call_indent-visual.rs b/tests/source/configs-fn_call_indent-visual.rs
index 9561ffae23b..9a679d6bb4c 100644
--- a/tests/source/configs-fn_call_indent-visual.rs
+++ b/tests/source/configs-fn_call_indent-visual.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_call_indent: Visual
+// rustfmt-indent_style: Visual
 // Function call style
 
 fn main() {
diff --git a/tests/source/configs-fn_call_width-zero.rs b/tests/source/configs-fn_call_width-zero.rs
index da227dec4c7..e7db3261556 100644
--- a/tests/source/configs-fn_call_width-zero.rs
+++ b/tests/source/configs-fn_call_width-zero.rs
@@ -1,5 +1,5 @@
 // rustfmt-fn_call_width: 0
-// rustfmt-fn_call_indent: block
+// rustfmt-indent_style: block
 
 // #1508
 fn a() {
diff --git a/tests/source/configs-generics_indent-block.rs b/tests/source/configs-generics_indent-block.rs
index 9bfde87e88b..2cf17be56ef 100644
--- a/tests/source/configs-generics_indent-block.rs
+++ b/tests/source/configs-generics_indent-block.rs
@@ -1,4 +1,4 @@
-// rustfmt-generics_indent: Block
+// rustfmt-indent_style: Block
 // Generics indent
 
 fn lorem<Ipsum: Eq = usize, Dolor: Eq = usize, Sit: Eq = usize, Amet: Eq = usize, Adipiscing: Eq = usize, Consectetur: Eq = usize, Elit: Eq = usize>(ipsum: Ipsum, dolor: Dolor, sit: Sit, amet: Amet, adipiscing: Adipiscing, consectetur: Consectetur, elit: Elit) -> T {
diff --git a/tests/source/configs-generics_indent-visual.rs b/tests/source/configs-generics_indent-visual.rs
index 3129dc1c3c7..1f910d32d87 100644
--- a/tests/source/configs-generics_indent-visual.rs
+++ b/tests/source/configs-generics_indent-visual.rs
@@ -1,4 +1,4 @@
-// rustfmt-generics_indent: Visual
+// rustfmt-indent_style: Visual
 // Generics indent
 
 fn lorem<Ipsum: Eq = usize, Dolor: Eq = usize, Sit: Eq = usize, Amet: Eq = usize, Adipiscing: Eq = usize, Consectetur: Eq = usize, Elit: Eq = usize>(ipsum: Ipsum, dolor: Dolor, sit: Sit, amet: Amet, adipiscing: Adipiscing, consectetur: Consectetur, elit: Elit) -> T {
diff --git a/tests/source/configs-struct_lit_indent-block.rs b/tests/source/configs-struct_lit_indent-block.rs
index 4f66c192bbc..47a6994f40c 100644
--- a/tests/source/configs-struct_lit_indent-block.rs
+++ b/tests/source/configs-struct_lit_indent-block.rs
@@ -1,4 +1,4 @@
-// rustfmt-struct_lit_indent: Block
+// rustfmt-indent_style: Block
 // Struct literal-style
 
 fn main() {
diff --git a/tests/source/configs-struct_lit_indent-visual.rs b/tests/source/configs-struct_lit_indent-visual.rs
index 837ae1b40cb..45538e70482 100644
--- a/tests/source/configs-struct_lit_indent-visual.rs
+++ b/tests/source/configs-struct_lit_indent-visual.rs
@@ -1,4 +1,4 @@
-// rustfmt-struct_lit_indent: Visual
+// rustfmt-indent_style: Visual
 // Struct literal-style
 
 fn main() {
diff --git a/tests/source/configs-tab_spaces-2.rs b/tests/source/configs-tab_spaces-2.rs
index cd3d601e1b6..5c2667bc2c7 100644
--- a/tests/source/configs-tab_spaces-2.rs
+++ b/tests/source/configs-tab_spaces-2.rs
@@ -1,6 +1,6 @@
 // rustfmt-tab_spaces: 2
 // rustfmt-max_width: 30
-// rustfmt-array_indent: Block
+// rustfmt-indent_style: Block
 // Tab spaces
 
 fn lorem() {
diff --git a/tests/source/configs-tab_spaces-4.rs b/tests/source/configs-tab_spaces-4.rs
index 3a18f9be0ee..da61bbd42a7 100644
--- a/tests/source/configs-tab_spaces-4.rs
+++ b/tests/source/configs-tab_spaces-4.rs
@@ -1,6 +1,6 @@
 // rustfmt-tab_spaces: 4
 // rustfmt-max_width: 30
-// rustfmt-array_indent: Block
+// rustfmt-indent_style: Block
 // Tab spaces
 
 fn lorem() {
diff --git a/tests/source/configs-where_pred_indent-block.rs b/tests/source/configs-where_pred_indent-block.rs
index 8474dc4dd01..450491f0270 100644
--- a/tests/source/configs-where_pred_indent-block.rs
+++ b/tests/source/configs-where_pred_indent-block.rs
@@ -1,4 +1,4 @@
-// rustfmt-where_pred_indent: Block
+// rustfmt-indent_style: Block
 // Where predicate indent
 
 fn lorem<Ipsum, Dolor, Sit, Amet>() -> T where Ipsum: Eq, Dolor: Eq, Sit: Eq, Amet: Eq {
diff --git a/tests/source/configs-where_pred_indent-visual.rs b/tests/source/configs-where_pred_indent-visual.rs
index 79b7a371047..055806b6862 100644
--- a/tests/source/configs-where_pred_indent-visual.rs
+++ b/tests/source/configs-where_pred_indent-visual.rs
@@ -1,4 +1,4 @@
-// rustfmt-where_pred_indent: Visual
+// rustfmt-indent_style: Visual
 // Where predicate indent
 
 fn lorem<Ipsum, Dolor, Sit, Amet>() -> T where Ipsum: Eq, Dolor: Eq, Sit: Eq, Amet: Eq {
diff --git a/tests/source/configs-where_style-default.rs b/tests/source/configs-where_style-default.rs
index e082f863f33..34fa216cb80 100644
--- a/tests/source/configs-where_style-default.rs
+++ b/tests/source/configs-where_style-default.rs
@@ -1,4 +1,4 @@
-// rustfmt-where_style: Legacy
+// rustfmt-indent_style: Legacy
 // Where style
 
 fn lorem<Ipsum, Dolor, Sit, Amet>() -> T where Ipsum: Eq, Dolor: Eq, Sit: Eq, Amet: Eq {
diff --git a/tests/source/configs-where_style-rfc.rs b/tests/source/configs-where_style-rfc.rs
index 7b93cc9514a..24f4a7c7ea8 100644
--- a/tests/source/configs-where_style-rfc.rs
+++ b/tests/source/configs-where_style-rfc.rs
@@ -1,4 +1,4 @@
-// rustfmt-where_style: Rfc
+// rustfmt-indent_style: Rfc
 // Where style
 
 fn lorem<Ipsum, Dolor, Sit, Amet>() -> T where Ipsum: Eq, Dolor: Eq, Sit: Eq, Amet: Eq {
diff --git a/tests/source/expr-block.rs b/tests/source/expr-block.rs
index 3d46e3a9801..a2e7ac8fc44 100644
--- a/tests/source/expr-block.rs
+++ b/tests/source/expr-block.rs
@@ -1,6 +1,4 @@
-// rustfmt-array_indent: Block
-// rustfmt-fn_call_indent: Block
-// rustfmt-control_style: Rfc
+// rustfmt-indent_style: Block
 // Test expressions with block formatting.
 
 fn arrays() {
diff --git a/tests/source/fn-custom-2.rs b/tests/source/fn-custom-2.rs
index bdbbb45aaa0..4fb427a1b1f 100644
--- a/tests/source/fn-custom-2.rs
+++ b/tests/source/fn-custom-2.rs
@@ -1,5 +1,4 @@
-// rustfmt-fn_args_indent: Block
-// rustfmt-generics_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-where_layout: Mixed
 // Test different indents.
 
diff --git a/tests/source/fn-custom-3.rs b/tests/source/fn-custom-3.rs
index 2d05b1138f2..efaf559c9da 100644
--- a/tests/source/fn-custom-3.rs
+++ b/tests/source/fn-custom-3.rs
@@ -1,5 +1,4 @@
-// rustfmt-fn_args_indent: Block
-// rustfmt-generics_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-where_layout: HorizontalVertical
 // Test different indents.
 
diff --git a/tests/source/fn-custom-4.rs b/tests/source/fn-custom-4.rs
index 009ceb87c2b..668cdce382d 100644
--- a/tests/source/fn-custom-4.rs
+++ b/tests/source/fn-custom-4.rs
@@ -1,4 +1,4 @@
-// rustfmt-where_pred_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-where_density: Compressed
 // Test different indents.
 
diff --git a/tests/source/fn-custom-6.rs b/tests/source/fn-custom-6.rs
index b8677e4bbec..f345e1cb3e9 100644
--- a/tests/source/fn-custom-6.rs
+++ b/tests/source/fn-custom-6.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-fn_brace_style: PreferSameLine
 // Test different indents.
 
diff --git a/tests/source/fn-custom-7.rs b/tests/source/fn-custom-7.rs
index fceb4152575..03b9a895970 100644
--- a/tests/source/fn-custom-7.rs
+++ b/tests/source/fn-custom-7.rs
@@ -1,5 +1,5 @@
 // rustfmt-normalize_comments: true
-// rustfmt-fn_args_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-fn_args_density: Vertical
 // rustfmt-fn_brace_style: AlwaysNextLine
 
diff --git a/tests/source/fn-custom-8.rs b/tests/source/fn-custom-8.rs
index fbc411919c7..40ea44f084a 100644
--- a/tests/source/fn-custom-8.rs
+++ b/tests/source/fn-custom-8.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-fn_brace_style: PreferSameLine
 // Test different indents.
 
diff --git a/tests/source/fn_args_indent-block.rs b/tests/source/fn_args_indent-block.rs
index 4368274cc84..b056fcb56fe 100644
--- a/tests/source/fn_args_indent-block.rs
+++ b/tests/source/fn_args_indent-block.rs
@@ -1,5 +1,5 @@
 // rustfmt-normalize_comments: true
-// rustfmt-fn_args_indent: Block
+// rustfmt-indent_style: Block
 
 fn foo() {
     foo();
diff --git a/tests/source/issue-1278.rs b/tests/source/issue-1278.rs
index d199773c834..e25376561a9 100644
--- a/tests/source/issue-1278.rs
+++ b/tests/source/issue-1278.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_indent = "block"
+// rustfmt-indent_style = "block"
 
 #![feature(pub_restricted)]
 
diff --git a/tests/source/struct_lits_visual.rs b/tests/source/struct_lits_visual.rs
index de083183ab9..2c6cc674960 100644
--- a/tests/source/struct_lits_visual.rs
+++ b/tests/source/struct_lits_visual.rs
@@ -1,6 +1,6 @@
 // rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
-// rustfmt-struct_lit_indent: Visual
+// rustfmt-indent_style: Visual
 // rustfmt-error_on_line_overflow: false
 
 // Struct literal expressions.
diff --git a/tests/source/struct_lits_visual_multiline.rs b/tests/source/struct_lits_visual_multiline.rs
index e8af1486f36..074853cf3da 100644
--- a/tests/source/struct_lits_visual_multiline.rs
+++ b/tests/source/struct_lits_visual_multiline.rs
@@ -1,6 +1,6 @@
 // rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
-// rustfmt-struct_lit_indent: Visual
+// rustfmt-indent_style: Visual
 // rustfmt-struct_lit_multiline_style: ForceMulti
 // rustfmt-error_on_line_overflow: false
 
diff --git a/tests/source/struct_tuple_visual.rs b/tests/source/struct_tuple_visual.rs
index 2bc2c11d333..369feae71d2 100644
--- a/tests/source/struct_tuple_visual.rs
+++ b/tests/source/struct_tuple_visual.rs
@@ -1,7 +1,7 @@
 // rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
 // rustfmt-error_on_line_overflow: false
-// rustfmt-struct_lit_indent: Visual
+// rustfmt-indent_style: Visual
 fn foo() {
     Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo(f(), b());
 
diff --git a/tests/source/where-clause-rfc.rs b/tests/source/where-clause-rfc.rs
index 7dc5e87a9fe..e41e9a6cea1 100644
--- a/tests/source/where-clause-rfc.rs
+++ b/tests/source/where-clause-rfc.rs
@@ -1,5 +1,4 @@
-// rustfmt-fn_args_indent: Block
-// rustfmt-where_style: Rfc
+// rustfmt-indent_style: Block
 
 fn reflow_list_node_with_rule(node: &CompoundNode, rule: &Rule, args: &[Arg], shape: &Shape) where T: FOo, U: Bar {
     let mut effects = HashMap::new();
diff --git a/tests/target/big-impl-rfc.rs b/tests/target/big-impl-rfc.rs
index b5c7b376f78..6c21f8a22e4 100644
--- a/tests/target/big-impl-rfc.rs
+++ b/tests/target/big-impl-rfc.rs
@@ -1,7 +1,7 @@
-// rustfmt-fn_args_indent: Block
-// rustfmt-fn_call_indent: Block
-// rustfmt-generics_indent: Block
-// rustfmt-where_style: Rfc
+// rustfmt-indent_style: Block
+// rustfmt-indent_style: Block
+// rustfmt-indent_style: Block
+// rustfmt-indent_style: Rfc
 
 // #1357
 impl<'a, Select, From, Distinct, Where, Order, Limit, Offset, Groupby, DB> InternalBoxedDsl<'a, DB>
diff --git a/tests/target/closure-block-inside-macro.rs b/tests/target/closure-block-inside-macro.rs
index 2f7e04957e9..c1260592083 100644
--- a/tests/target/closure-block-inside-macro.rs
+++ b/tests/target/closure-block-inside-macro.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_call_indent: Block
+// rustfmt-indent_style: Block
 
 // #1547
 fuzz_target!(|data: &[u8]| if let Some(first) = data.first() {
diff --git a/tests/target/configs-array_horizontal_layout_threshold-1000-visual.rs b/tests/target/configs-array_horizontal_layout_threshold-1000-visual.rs
index a4a2f6a3d2c..78a3c828c5d 100644
--- a/tests/target/configs-array_horizontal_layout_threshold-1000-visual.rs
+++ b/tests/target/configs-array_horizontal_layout_threshold-1000-visual.rs
@@ -1,5 +1,5 @@
 // rustfmt-array_horizontal_layout_threshold: 1000
-// rustfmt-array_indent: Visual
+// rustfmt-indent_style: Visual
 
 const ARRAY: [u8; 2048] =
     [99, 72, 48, 104, 44, 112, 38, 62, 40, 93, 23, 24, 32, 21, 102, 76, 65, 29, 116, 21, 18, 37,
diff --git a/tests/target/configs-array_indent-block.rs b/tests/target/configs-array_indent-block.rs
index c6c22096759..5d458248c0b 100644
--- a/tests/target/configs-array_indent-block.rs
+++ b/tests/target/configs-array_indent-block.rs
@@ -1,4 +1,4 @@
-// rustfmt-array_indent: Block
+// rustfmt-indent_style: Block
 // Array layout
 
 fn main() {
diff --git a/tests/target/configs-array_indent-visual.rs b/tests/target/configs-array_indent-visual.rs
index bd15f2a3737..1da6ff23738 100644
--- a/tests/target/configs-array_indent-visual.rs
+++ b/tests/target/configs-array_indent-visual.rs
@@ -1,4 +1,4 @@
-// rustfmt-array_indent: Visual
+// rustfmt-indent_style: Visual
 // Array layout
 
 fn main() {
diff --git a/tests/target/configs-combine_control_expr-false.rs b/tests/target/configs-combine_control_expr-false.rs
index 432b2a03960..81eff08660d 100644
--- a/tests/target/configs-combine_control_expr-false.rs
+++ b/tests/target/configs-combine_control_expr-false.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_call_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-combine_control_expr: false
 // Combining openings and closings. See https://github.com/rust-lang-nursery/fmt-rfcs/issues/61.
 
diff --git a/tests/target/configs-combine_control_expr-true.rs b/tests/target/configs-combine_control_expr-true.rs
index 58db874a825..c5372c2ff37 100644
--- a/tests/target/configs-combine_control_expr-true.rs
+++ b/tests/target/configs-combine_control_expr-true.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_call_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-combine_control_expr: true
 // Combining openings and closings. See https://github.com/rust-lang-nursery/fmt-rfcs/issues/61.
 
diff --git a/tests/target/configs-control_style-rfc.rs b/tests/target/configs-control_style-rfc.rs
index 37da727b2a1..f2023bcbc5b 100644
--- a/tests/target/configs-control_style-rfc.rs
+++ b/tests/target/configs-control_style-rfc.rs
@@ -1,4 +1,4 @@
-// rustfmt-control_style: Rfc
+// rustfmt-indent_style: Rfc
 
 // #1618
 fn main() {
diff --git a/tests/target/configs-fn_args_indent-block.rs b/tests/target/configs-fn_args_indent-block.rs
index 407a078596d..80f4e133356 100644
--- a/tests/target/configs-fn_args_indent-block.rs
+++ b/tests/target/configs-fn_args_indent-block.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_indent: Block
+// rustfmt-indent_style: Block
 // Function arguments layout
 
 fn lorem() {}
diff --git a/tests/target/configs-fn_args_indent-visual.rs b/tests/target/configs-fn_args_indent-visual.rs
index fedea41662a..04c2eaee3cf 100644
--- a/tests/target/configs-fn_args_indent-visual.rs
+++ b/tests/target/configs-fn_args_indent-visual.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_indent: Visual
+// rustfmt-indent_style: Visual
 // Function arguments layout
 
 fn lorem() {}
diff --git a/tests/target/configs-fn_call_indent-block-tab_spaces-2.rs b/tests/target/configs-fn_call_indent-block-tab_spaces-2.rs
index 238ab10060e..5531e61ddc8 100644
--- a/tests/target/configs-fn_call_indent-block-tab_spaces-2.rs
+++ b/tests/target/configs-fn_call_indent-block-tab_spaces-2.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_call_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-max_width: 80
 // rustfmt-tab_spaces: 2
 
diff --git a/tests/target/configs-fn_call_indent-block-trailing-comma.rs b/tests/target/configs-fn_call_indent-block-trailing-comma.rs
index c7609d8e462..a7e8590ed97 100644
--- a/tests/target/configs-fn_call_indent-block-trailing-comma.rs
+++ b/tests/target/configs-fn_call_indent-block-trailing-comma.rs
@@ -1,5 +1,5 @@
 // rustfmt-error_on_line_overflow: false
-// rustfmt-fn_call_indent: Block
+// rustfmt-indent_style: Block
 
 // rustfmt should not add trailing comma when rewriting macro. See #1528.
 fn a() {
diff --git a/tests/target/configs-fn_call_indent-block.rs b/tests/target/configs-fn_call_indent-block.rs
index 0f9cbfcc0e3..905d34a0978 100644
--- a/tests/target/configs-fn_call_indent-block.rs
+++ b/tests/target/configs-fn_call_indent-block.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_call_indent: Block
+// rustfmt-indent_style: Block
 // Function call style
 
 fn main() {
diff --git a/tests/target/configs-fn_call_indent-visual-trailing-comma.rs b/tests/target/configs-fn_call_indent-visual-trailing-comma.rs
index d6d1a86a631..9738d397dbf 100644
--- a/tests/target/configs-fn_call_indent-visual-trailing-comma.rs
+++ b/tests/target/configs-fn_call_indent-visual-trailing-comma.rs
@@ -1,5 +1,5 @@
 // rustfmt-error_on_line_overflow: false
-// rustfmt-fn_call_indent: Visual
+// rustfmt-indent_style: Visual
 
 // rustfmt should not add trailing comma when rewriting macro. See #1528.
 fn a() {
diff --git a/tests/target/configs-fn_call_indent-visual.rs b/tests/target/configs-fn_call_indent-visual.rs
index 3a1e53a2274..5454c44ef96 100644
--- a/tests/target/configs-fn_call_indent-visual.rs
+++ b/tests/target/configs-fn_call_indent-visual.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_call_indent: Visual
+// rustfmt-indent_style: Visual
 // Function call style
 
 fn main() {
diff --git a/tests/target/configs-fn_call_width-zero.rs b/tests/target/configs-fn_call_width-zero.rs
index f91a03c8188..1455ecd967c 100644
--- a/tests/target/configs-fn_call_width-zero.rs
+++ b/tests/target/configs-fn_call_width-zero.rs
@@ -1,5 +1,5 @@
 // rustfmt-fn_call_width: 0
-// rustfmt-fn_call_indent: block
+// rustfmt-indent_style: block
 
 // #1508
 fn a() {
diff --git a/tests/target/configs-generics_indent-block.rs b/tests/target/configs-generics_indent-block.rs
index 0950a716fde..c4fcaaf65d1 100644
--- a/tests/target/configs-generics_indent-block.rs
+++ b/tests/target/configs-generics_indent-block.rs
@@ -1,4 +1,4 @@
-// rustfmt-generics_indent: Block
+// rustfmt-indent_style: Block
 // Generics indent
 
 fn lorem<
diff --git a/tests/target/configs-generics_indent-visual.rs b/tests/target/configs-generics_indent-visual.rs
index 1160772f29f..5ea1c914389 100644
--- a/tests/target/configs-generics_indent-visual.rs
+++ b/tests/target/configs-generics_indent-visual.rs
@@ -1,4 +1,4 @@
-// rustfmt-generics_indent: Visual
+// rustfmt-indent_style: Visual
 // Generics indent
 
 fn lorem<Ipsum: Eq = usize,
diff --git a/tests/target/configs-imports_indent-block.rs b/tests/target/configs-imports_indent-block.rs
index 84c3b26bd6e..871a4aab8e9 100644
--- a/tests/target/configs-imports_indent-block.rs
+++ b/tests/target/configs-imports_indent-block.rs
@@ -1,4 +1,4 @@
-// rustfmt-imports_indent: Block
+// rustfmt-indent_style: Block
 
 use lists::{
     definitive_tactic, itemize_list, shape_for_tactic, struct_lit_formatting, struct_lit_shape,
diff --git a/tests/target/configs-imports_layout-horizontal_vertical.rs b/tests/target/configs-imports_layout-horizontal_vertical.rs
index 4a63556d45b..5fbb5d1eacd 100644
--- a/tests/target/configs-imports_layout-horizontal_vertical.rs
+++ b/tests/target/configs-imports_layout-horizontal_vertical.rs
@@ -1,4 +1,4 @@
-// rustfmt-imports_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-imports_layout: HorizontalVertical
 
 use comment::{contains_comment, recover_comment_removed, rewrite_comment, FindUncommented};
diff --git a/tests/target/configs-imports_layout-mixed.rs b/tests/target/configs-imports_layout-mixed.rs
index 5d3349a01bb..cf85ff8d79d 100644
--- a/tests/target/configs-imports_layout-mixed.rs
+++ b/tests/target/configs-imports_layout-mixed.rs
@@ -1,4 +1,4 @@
-// rustfmt-imports_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-imports_layout: Mixed
 
 use comment::{contains_comment, recover_comment_removed, rewrite_comment, FindUncommented};
diff --git a/tests/target/configs-struct_lit_indent-block.rs b/tests/target/configs-struct_lit_indent-block.rs
index 19e276c2d76..656b562266f 100644
--- a/tests/target/configs-struct_lit_indent-block.rs
+++ b/tests/target/configs-struct_lit_indent-block.rs
@@ -1,4 +1,4 @@
-// rustfmt-struct_lit_indent: Block
+// rustfmt-indent_style: Block
 // Struct literal-style
 
 fn main() {
diff --git a/tests/target/configs-struct_lit_indent-visual.rs b/tests/target/configs-struct_lit_indent-visual.rs
index fd20e2cde6c..b4effba0e8a 100644
--- a/tests/target/configs-struct_lit_indent-visual.rs
+++ b/tests/target/configs-struct_lit_indent-visual.rs
@@ -1,4 +1,4 @@
-// rustfmt-struct_lit_indent: Visual
+// rustfmt-indent_style: Visual
 // Struct literal-style
 
 fn main() {
diff --git a/tests/target/configs-tab_spaces-2.rs b/tests/target/configs-tab_spaces-2.rs
index 3bbb4c05290..85961706ea7 100644
--- a/tests/target/configs-tab_spaces-2.rs
+++ b/tests/target/configs-tab_spaces-2.rs
@@ -1,6 +1,6 @@
 // rustfmt-tab_spaces: 2
 // rustfmt-max_width: 30
-// rustfmt-array_indent: Block
+// rustfmt-indent_style: Block
 // Tab spaces
 
 fn lorem() {
diff --git a/tests/target/configs-tab_spaces-4.rs b/tests/target/configs-tab_spaces-4.rs
index c8c802c9db5..524a55121e4 100644
--- a/tests/target/configs-tab_spaces-4.rs
+++ b/tests/target/configs-tab_spaces-4.rs
@@ -1,6 +1,6 @@
 // rustfmt-tab_spaces: 4
 // rustfmt-max_width: 30
-// rustfmt-array_indent: Block
+// rustfmt-indent_style: Block
 // Tab spaces
 
 fn lorem() {
diff --git a/tests/target/configs-where_pred_indent-block.rs b/tests/target/configs-where_pred_indent-block.rs
index b880995ccce..ad7e0b8f363 100644
--- a/tests/target/configs-where_pred_indent-block.rs
+++ b/tests/target/configs-where_pred_indent-block.rs
@@ -1,4 +1,4 @@
-// rustfmt-where_pred_indent: Block
+// rustfmt-indent_style: Block
 // Where predicate indent
 
 fn lorem<Ipsum, Dolor, Sit, Amet>() -> T
diff --git a/tests/target/configs-where_pred_indent-visual.rs b/tests/target/configs-where_pred_indent-visual.rs
index 11da3a3ba85..b878d726dff 100644
--- a/tests/target/configs-where_pred_indent-visual.rs
+++ b/tests/target/configs-where_pred_indent-visual.rs
@@ -1,4 +1,4 @@
-// rustfmt-where_pred_indent: Visual
+// rustfmt-indent_style: Visual
 // Where predicate indent
 
 fn lorem<Ipsum, Dolor, Sit, Amet>() -> T
diff --git a/tests/target/configs-where_style-default.rs b/tests/target/configs-where_style-default.rs
index 2971ac4c5e6..a4bdee0183d 100644
--- a/tests/target/configs-where_style-default.rs
+++ b/tests/target/configs-where_style-default.rs
@@ -1,4 +1,4 @@
-// rustfmt-where_style: Legacy
+// rustfmt-indent_style: Legacy
 // Where style
 
 fn lorem<Ipsum, Dolor, Sit, Amet>() -> T
diff --git a/tests/target/configs-where_style-rfc.rs b/tests/target/configs-where_style-rfc.rs
index 0d5fe5ca51e..5d4edfd107c 100644
--- a/tests/target/configs-where_style-rfc.rs
+++ b/tests/target/configs-where_style-rfc.rs
@@ -1,4 +1,4 @@
-// rustfmt-where_style: Rfc
+// rustfmt-indent_style: Rfc
 // Where style
 
 fn lorem<Ipsum, Dolor, Sit, Amet>() -> T
diff --git a/tests/target/expr-block.rs b/tests/target/expr-block.rs
index a76c761f1dc..646569e15f1 100644
--- a/tests/target/expr-block.rs
+++ b/tests/target/expr-block.rs
@@ -1,6 +1,4 @@
-// rustfmt-array_indent: Block
-// rustfmt-fn_call_indent: Block
-// rustfmt-control_style: Rfc
+// rustfmt-indent_style: Block
 // Test expressions with block formatting.
 
 fn arrays() {
diff --git a/tests/target/fn-custom-2.rs b/tests/target/fn-custom-2.rs
index cec0b29854f..bf528989fd4 100644
--- a/tests/target/fn-custom-2.rs
+++ b/tests/target/fn-custom-2.rs
@@ -1,5 +1,4 @@
-// rustfmt-fn_args_indent: Block
-// rustfmt-generics_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-where_layout: Mixed
 // Test different indents.
 
diff --git a/tests/target/fn-custom-3.rs b/tests/target/fn-custom-3.rs
index 633ab05030d..6561140196b 100644
--- a/tests/target/fn-custom-3.rs
+++ b/tests/target/fn-custom-3.rs
@@ -1,5 +1,4 @@
-// rustfmt-fn_args_indent: Block
-// rustfmt-generics_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-where_layout: HorizontalVertical
 // Test different indents.
 
diff --git a/tests/target/fn-custom-4.rs b/tests/target/fn-custom-4.rs
index 297aae5123b..35895f386d0 100644
--- a/tests/target/fn-custom-4.rs
+++ b/tests/target/fn-custom-4.rs
@@ -1,4 +1,4 @@
-// rustfmt-where_pred_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-where_density: Compressed
 // Test different indents.
 
diff --git a/tests/target/fn-custom-6.rs b/tests/target/fn-custom-6.rs
index f7bf2f04eaf..2c86ade3c83 100644
--- a/tests/target/fn-custom-6.rs
+++ b/tests/target/fn-custom-6.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-fn_brace_style: PreferSameLine
 // Test different indents.
 
diff --git a/tests/target/fn-custom-7.rs b/tests/target/fn-custom-7.rs
index b9f1820d066..88c6ab10d80 100644
--- a/tests/target/fn-custom-7.rs
+++ b/tests/target/fn-custom-7.rs
@@ -1,5 +1,5 @@
 // rustfmt-normalize_comments: true
-// rustfmt-fn_args_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-fn_args_density: Vertical
 // rustfmt-fn_brace_style: AlwaysNextLine
 
diff --git a/tests/target/fn-custom-8.rs b/tests/target/fn-custom-8.rs
index 78880206f34..151f7f2a0f2 100644
--- a/tests/target/fn-custom-8.rs
+++ b/tests/target/fn-custom-8.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-fn_brace_style: PreferSameLine
 // Test different indents.
 
diff --git a/tests/target/fn_args_indent-block.rs b/tests/target/fn_args_indent-block.rs
index afe453ca233..04c18816d0b 100644
--- a/tests/target/fn_args_indent-block.rs
+++ b/tests/target/fn_args_indent-block.rs
@@ -1,5 +1,5 @@
 // rustfmt-normalize_comments: true
-// rustfmt-fn_args_indent: Block
+// rustfmt-indent_style: Block
 
 fn foo() {
     foo();
diff --git a/tests/target/issue-1278.rs b/tests/target/issue-1278.rs
index d199773c834..e25376561a9 100644
--- a/tests/target/issue-1278.rs
+++ b/tests/target/issue-1278.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_indent = "block"
+// rustfmt-indent_style = "block"
 
 #![feature(pub_restricted)]
 
diff --git a/tests/target/issue-1624.rs b/tests/target/issue-1624.rs
index a41fff2e750..7385118528b 100644
--- a/tests/target/issue-1624.rs
+++ b/tests/target/issue-1624.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_indent: Block
+// rustfmt-indent_style: Block
 // rustfmt-fn_args_paren_newline: false
 
 // #1624
diff --git a/tests/target/struct_lits_visual.rs b/tests/target/struct_lits_visual.rs
index cef6e8b68c5..7e93b91d8c1 100644
--- a/tests/target/struct_lits_visual.rs
+++ b/tests/target/struct_lits_visual.rs
@@ -1,6 +1,6 @@
 // rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
-// rustfmt-struct_lit_indent: Visual
+// rustfmt-indent_style: Visual
 // rustfmt-error_on_line_overflow: false
 
 // Struct literal expressions.
diff --git a/tests/target/struct_lits_visual_multiline.rs b/tests/target/struct_lits_visual_multiline.rs
index 74dd654ac50..936a4061cb4 100644
--- a/tests/target/struct_lits_visual_multiline.rs
+++ b/tests/target/struct_lits_visual_multiline.rs
@@ -1,6 +1,6 @@
 // rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
-// rustfmt-struct_lit_indent: Visual
+// rustfmt-indent_style: Visual
 // rustfmt-struct_lit_multiline_style: ForceMulti
 // rustfmt-error_on_line_overflow: false
 
diff --git a/tests/target/struct_tuple_visual.rs b/tests/target/struct_tuple_visual.rs
index 7723f042e6f..af553942295 100644
--- a/tests/target/struct_tuple_visual.rs
+++ b/tests/target/struct_tuple_visual.rs
@@ -1,7 +1,7 @@
 // rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
 // rustfmt-error_on_line_overflow: false
-// rustfmt-struct_lit_indent: Visual
+// rustfmt-indent_style: Visual
 fn foo() {
     Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo(f(), b());
 
diff --git a/tests/target/where-clause-rfc.rs b/tests/target/where-clause-rfc.rs
index bf3a93e27fb..1e83d5b3abc 100644
--- a/tests/target/where-clause-rfc.rs
+++ b/tests/target/where-clause-rfc.rs
@@ -1,5 +1,4 @@
-// rustfmt-fn_args_indent: Block
-// rustfmt-where_style: Rfc
+// rustfmt-indent_style: Block
 
 fn reflow_list_node_with_rule(node: &CompoundNode, rule: &Rule, args: &[Arg], shape: &Shape)
 where