Rename option and change type to bool

Author: dylni

Configurations.md

@@ -2063,15 +2063,47 @@ fn lorem<T:Eq>(t:T) {
 
 See also: [`space_before_colon`](#space_before_colon).
 
-## `space_after_function_name`
+## `space_before_colon`
+
+Leave a space before the colon.
+
+- **Default value**: `false`
+- **Possible values**: `true`, `false`
+- **Stable**: No (tracking issue: [#3365](https://github.com/rust-lang/rustfmt/issues/3365))
+
+#### `false` (default):
+
+```rust
+fn lorem<T: Eq>(t: T) {
+    let lorem: Dolor = Lorem {
+        ipsum: dolor,
+        sit: amet,
+    };
+}
+```
 
-Leave a space after the function name.
+#### `true`:
 
-- **Default value**: `"Never"`
-- **Possible values**: `"AfterGenerics"`, `"Never"`
+```rust
+fn lorem<T : Eq>(t : T) {
+    let lorem : Dolor = Lorem {
+        ipsum : dolor,
+        sit : amet,
+    };
+}
+```
+
+See also: [`space_after_colon`](#space_after_colon).
+
+## `space_before_fn_params`
+
+Leave a space before function parameters.
+
+- **Default value**: `false`
+- **Possible values**: `true`, `false`
 - **Stable**: No (tracking issue: [#3564](https://github.com/rust-lang/rustfmt/issues/3564))
 
-#### `"Never"` (default):
+#### `false` (default):
 
 ```rust
 fn lorem() {
@@ -2090,7 +2122,7 @@ where
 }
 ```
 
-#### `"AfterGenerics"`:
+#### `true`:
 
 ```rust
 fn lorem () {
@@ -2109,38 +2141,6 @@ where
 }
 ```
 
-## `space_before_colon`
-
-Leave a space before the colon.
-
-- **Default value**: `false`
-- **Possible values**: `true`, `false`
-- **Stable**: No (tracking issue: [#3365](https://github.com/rust-lang/rustfmt/issues/3365))
-
-#### `false` (default):
-
-```rust
-fn lorem<T: Eq>(t: T) {
-    let lorem: Dolor = Lorem {
-        ipsum: dolor,
-        sit: amet,
-    };
-}
-```
-
-#### `true`:
-
-```rust
-fn lorem<T : Eq>(t : T) {
-    let lorem : Dolor = Lorem {
-        ipsum : dolor,
-        sit : amet,
-    };
-}
-```
-
-See also: [`space_after_colon`](#space_after_colon).
-
 ## `spaces_around_ranges`
 
 Put spaces around the .., ..=, and ... range operators

src/config.rs

@@ -94,8 +94,7 @@ create_config! {
     spaces_around_ranges: bool, false, false, "Put spaces around the  .. and ..= range operators";
     binop_separator: SeparatorPlace, SeparatorPlace::Front, true,
         "Where to put a binary operator when a binary expression goes multiline";
-    space_after_function_name: SpaceAfterFunctionName, SpaceAfterFunctionName::Never, false,
-        "Leave a space after the function name.";
+    space_before_fn_params: bool, false, false, "Leave a space before function parameters.";
 
     // Misc.
     remove_nested_parens: bool, true, true, "Remove nested parens";
@@ -599,7 +598,7 @@ space_after_colon = true
 space_around_attr_eq = true
 spaces_around_ranges = false
 binop_separator = "Front"
-space_after_function_name = "Never"
+space_before_fn_params = false
 remove_nested_parens = true
 combine_control_expr = true
 overflow_delimited_expr = false

src/config/options.rs

@@ -359,15 +359,6 @@ pub enum MatchArmLeadingPipe {
     KeepExisting,
 }
 
-#[config_type]
-/// Where to add spaces after the function name.
-pub enum SpaceAfterFunctionName {
-    /// Never add spaces.
-    Never,
-    /// Add a space, and put generics before the space.
-    AfterGenerics,
-}
-
 #[cfg(test)]
 mod test {
     use std::path::PathBuf;

src/formatting/items.rs

@@ -9,7 +9,7 @@ use rustc_ast::{ast, ptr};
 use rustc_span::{source_map, symbol, BytePos, Span, DUMMY_SP};
 
 use crate::config::lists::*;
-use crate::config::{BraceStyle, Config, IndentStyle, SpaceAfterFunctionName};
+use crate::config::{BraceStyle, Config, IndentStyle};
 use crate::formatting::{
     attr::filter_inline_attrs,
     comment::{
@@ -2228,7 +2228,7 @@ fn rewrite_fn_base(
         .last()
         .map_or(false, |l| l.trim_start().len() == 1);
 
-    if let SpaceAfterFunctionName::AfterGenerics = context.config.space_after_function_name() {
+    if context.config.space_before_fn_params() {
         result.push(' ');
     }
 

tests/source/configs/space_after_function_name/fn_after_generics.rs renamed to tests/source/configs/space_before_fn_params/fn.rs

@@ -1,5 +1,5 @@
-// rustfmt-space_after_function_name: AfterGenerics
-// Function space after function name
+// rustfmt-space_before_fn_params: true
+// Function space before function parameters
 
 fn lorem() {
     // body

tests/source/configs/space_after_function_name/trait_after_generics.rs renamed to tests/source/configs/space_before_fn_params/trait.rs

@@ -1,5 +1,5 @@
-// rustfmt-space_after_function_name: AfterGenerics
-// Trait space after function name
+// rustfmt-space_before_fn_params: true
+// Trait space before function parameters
 
 trait Story {
     fn swap_context<T>(&mut self, context: T) -> Option<Box<Context>>

tests/source/configs/space_after_function_name/width_heuristics.rs renamed to tests/source/configs/space_before_fn_params/width_heuristics.rs

@@ -1,6 +1,6 @@
-// rustfmt-space_after_function_name: AfterGenerics
+// rustfmt-space_before_fn_params: true
 // rustfmt-max_width: 118
-// Trait space after function name
+// Trait space before function parameters
 
 trait Story {
     fn swap_context<T: 'static + Context + Send + Sync>(&mut self, context: T) -> Option<Box<Context + Send + Sync>>;

tests/target/configs/space_after_function_name/fn_after_generics.rs renamed to tests/target/configs/space_before_fn_params/fn.rs

@@ -1,5 +1,5 @@
-// rustfmt-space_after_function_name: AfterGenerics
-// Function space after function name
+// rustfmt-space_before_fn_params: true
+// Function space before function parameters
 
 fn lorem () {
     // body

tests/target/configs/space_after_function_name/trait_after_generics.rs renamed to tests/target/configs/space_before_fn_params/trait.rs

@@ -1,5 +1,5 @@
-// rustfmt-space_after_function_name: AfterGenerics
-// Trait space after function name
+// rustfmt-space_before_fn_params: true
+// Trait space before function parameters
 
 trait Story {
     fn swap_context<T> (&mut self, context: T) -> Option<Box<Context>>

tests/target/configs/space_after_function_name/width_heuristics.rs renamed to tests/target/configs/space_before_fn_params/width_heuristics.rs

@@ -1,6 +1,6 @@
-// rustfmt-space_after_function_name: AfterGenerics
+// rustfmt-space_before_fn_params: true
 // rustfmt-max_width: 118
-// Trait space after function name
+// Trait space before function parameters
 
 trait Story {
     fn swap_context<T: 'static + Context + Send + Sync> (&mut self, context: T)