Replace '_indent' with 'indent_style'

2025-01-19 11:12:43 +00:00 · 2017-11-13 16:09:59 +09:00 · 2017-11-13 16:09:59 +09:00 · 96f3c36c04
commit 96f3c36c04
parent 8a27a2da62
79 changed files with 82 additions and 98 deletions
--- 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
--- 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<
--- 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() {
--- 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,
--- 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() {
--- 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() {
--- 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() {}
--- 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() {}
--- 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() {
--- 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() {
--- 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() {
--- 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() {
--- 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() {
--- 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 {
--- 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 {
--- 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() {
--- 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() {
--- 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() {
--- 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() {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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() {
--- 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.

--- 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.

--- 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.

--- 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.

--- 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

--- 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.

--- 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();
--- 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)]

--- 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.
--- 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

--- 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());

--- 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();
--- 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>
--- 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() {
--- 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,
--- 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() {
--- 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() {
--- 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.

--- 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.

--- 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() {
--- 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() {}
--- 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() {}
--- 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

--- 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() {
--- 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() {
--- 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() {
--- 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() {
--- 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() {
--- 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<
--- 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,
--- 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,
--- 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};
--- 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};
--- 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() {
--- 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() {
--- 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() {
--- 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() {
--- 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
--- 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
--- 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
--- 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
--- 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() {
--- 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.

--- 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.

--- 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.

--- 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.

--- 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

--- 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.

--- 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();
--- 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)]

--- 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
--- 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.
--- 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

--- 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());

--- 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