From a70f71610c65fea32ff4157e2fa23156dc89e3b8 Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Fri, 18 May 2018 16:41:21 +1200 Subject: [PATCH] stabilise `remove_nested_parens` and set default to true --- Configurations.md | 31 ++++++++++++++++--------------- src/config/mod.rs | 3 +-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Configurations.md b/Configurations.md index bd52d9d7379b..da07adc6ca0e 100644 --- a/Configurations.md +++ b/Configurations.md @@ -1260,7 +1260,7 @@ Convert /* */ comments to // comments where possible - **Default value**: `false` - **Possible values**: `true`, `false` -- **Stable**: Yes +- **Stable**: No #### `false` (default): @@ -1286,24 +1286,25 @@ fn adipiscing() -> usize {} Remove nested parens. -- **Defalut value**: `false`, +- **Default value**: `true`, - **Possible values**: `true`, `false` -- **Stable**: No +- **Stable**: Yes -#### `false` (default): -```rust -fn main() { - ((((foo())))); -} -``` -#### `true`: +#### `true` (default): ```rust fn main() { (foo()); } ``` +#### `false`: +```rust +fn main() { + ((((foo())))); +} +``` + ## `reorder_imports` @@ -1312,7 +1313,7 @@ separated by a newline). - **Default value**: `true` - **Possible values**: `true`, `false` -- **Stable**: No +- **Stable**: Yes #### `true` (default): @@ -1339,7 +1340,7 @@ Reorder `mod` declarations alphabetically in group. - **Default value**: `true` - **Possible values**: `true`, `false` -- **Stable**: No +- **Stable**: Yes #### `true` (default) @@ -1764,7 +1765,7 @@ Use field initialize shorthand if possible. - **Default value**: `false` - **Possible values**: `true`, `false` -- **Stable**: No +- **Stable**: Yes #### `false` (default): @@ -1806,7 +1807,7 @@ Replace uses of the try! macro by the ? shorthand - **Default value**: `false` - **Possible values**: `true`, `false` -- **Stable**: No +- **Stable**: Yes #### `false` (default): @@ -1831,7 +1832,7 @@ Break comments to fit on the line - **Default value**: `false` - **Possible values**: `true`, `false` -- **Stable**: Yes +- **Stable**: No #### `false` (default): diff --git a/src/config/mod.rs b/src/config/mod.rs index 6f9a5fdec782..ac39ae2652ff 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -82,6 +82,7 @@ create_config! { "Where to put a binary operator when a binary expression goes multiline."; // Misc. + remove_nested_parens: bool, true, true, "Remove nested parens."; remove_blank_lines_at_start_or_end_of_block: bool, true, false, "Remove blank lines at start or end of a block"; combine_control_expr: bool, true, false, "Combine control expressions with function calls."; @@ -105,8 +106,6 @@ create_config! { "Maximum number of blank lines which can be put between items."; blank_lines_lower_bound: usize, 0, false, "Minimum number of blank lines which must be put between items."; - remove_nested_parens: bool, false, false, - "Remove nested parens."; // Options that can change the source code beyond whitespace/blocks (somewhat linty things) merge_derives: bool, true, true, "Merge multiple `#[derive(...)]` into a single one";