diff --git a/src/config.rs b/src/config.rs index 99d1d360a8a..d05f6c9ea48 100644 --- a/src/config.rs +++ b/src/config.rs @@ -360,8 +360,6 @@ create_config! { // Should we at least try to put the where clause on the same line as the rest of the // function decl? where_density: Density, Density::CompressedIfEmpty, "Density of a where clause"; - // Visual will be treated like Tabbed - where_indent: IndentStyle, IndentStyle::Block, "Indentation of a where clause"; where_layout: ListTactic, ListTactic::Vertical, "Element layout inside a where clause"; where_pred_indent: IndentStyle, IndentStyle::Visual, "Indentation style of a where predicate"; diff --git a/tests/config/small_tabs.toml b/tests/config/small_tabs.toml index 57319012bc3..a682a88e811 100644 --- a/tests/config/small_tabs.toml +++ b/tests/config/small_tabs.toml @@ -8,7 +8,6 @@ fn_args_paren_newline = true fn_args_density = "Tall" fn_args_layout = "Visual" where_density = "Tall" -where_indent = "Block" where_layout = "Vertical" where_pred_indent = "Visual" generics_indent = "Visual" diff --git a/tests/source/fn-custom-2.rs b/tests/source/fn-custom-2.rs index 4a86f8c2d28..8c6813b054f 100644 --- a/tests/source/fn-custom-2.rs +++ b/tests/source/fn-custom-2.rs @@ -1,6 +1,5 @@ // rustfmt-fn_args_layout: Block // rustfmt-generics_indent: Block -// rustfmt-where_indent: Block // rustfmt-where_layout: Mixed // Test different indents. diff --git a/tests/source/fn-custom-6.rs b/tests/source/fn-custom-6.rs index fbac1bb1807..c056985c796 100644 --- a/tests/source/fn-custom-6.rs +++ b/tests/source/fn-custom-6.rs @@ -1,5 +1,4 @@ // rustfmt-fn_args_layout: Block -// rustfmt-where_indent: Block // rustfmt-fn_brace_style: PreferSameLine // Test different indents. diff --git a/tests/source/fn-custom-8.rs b/tests/source/fn-custom-8.rs index 5c4d51c0387..0855ca1058f 100644 --- a/tests/source/fn-custom-8.rs +++ b/tests/source/fn-custom-8.rs @@ -1,5 +1,4 @@ // rustfmt-fn_args_layout: Block -// rustfmt-where_indent: Block // rustfmt-fn_brace_style: PreferSameLine // Test different indents. diff --git a/tests/target/fn-custom-2.rs b/tests/target/fn-custom-2.rs index f0251b70b58..c2b012e52ab 100644 --- a/tests/target/fn-custom-2.rs +++ b/tests/target/fn-custom-2.rs @@ -1,6 +1,5 @@ // rustfmt-fn_args_layout: Block // rustfmt-generics_indent: Block -// rustfmt-where_indent: Block // rustfmt-where_layout: Mixed // Test different indents. diff --git a/tests/target/fn-custom-6.rs b/tests/target/fn-custom-6.rs index af58492497c..487d1d8b7ea 100644 --- a/tests/target/fn-custom-6.rs +++ b/tests/target/fn-custom-6.rs @@ -1,5 +1,4 @@ // rustfmt-fn_args_layout: Block -// rustfmt-where_indent: Block // rustfmt-fn_brace_style: PreferSameLine // Test different indents. diff --git a/tests/target/fn-custom-8.rs b/tests/target/fn-custom-8.rs index d029982728f..b32fc5d7cf2 100644 --- a/tests/target/fn-custom-8.rs +++ b/tests/target/fn-custom-8.rs @@ -1,5 +1,4 @@ // rustfmt-fn_args_layout: Block -// rustfmt-where_indent: Block // rustfmt-fn_brace_style: PreferSameLine // Test different indents.