rename fn_args_density configuration option to fn_args_layout

scampi · scampi · commit c6447e678900 · 2019-05-30T09:57:08.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@
 - Change option `format_doc_comment` to `format_code_in_doc_comment`.
 - `use_small_heuristics` changed to be an enum and stabilised. Configuration
   options are now ready for 1.0.
-- Stabilise `fn_args_density` configuration option #3581
+- Stabilise `fn_args_density` configuration option and rename it to `fn_args_layout` #3581
 
 ## [1.2.2] 2019-04-24
 
diff --git a/Configurations.md b/Configurations.md
@@ -629,7 +629,7 @@ trailing whitespaces.
 - **Possible values**: `true`, `false`
 - **Stable**: No (tracking issue: #3392)
 
-## `fn_args_density`
+## `fn_args_layout`
 
 Argument density in functions
 
diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -92,7 +92,7 @@ create_config! {
         the same line with the pattern of arms";
     force_multiline_blocks: bool, false, false,
         "Force multiline closure bodies and match arms to be wrapped in a block";
-    fn_args_density: Density, Density::Tall, true, "Argument density in functions";
+    fn_args_layout: Density, Density::Tall, true, "Argument density in functions";
     brace_style: BraceStyle, BraceStyle::SameLineWhere, false, "Brace style for items";
     control_brace_style: ControlBraceStyle, ControlBraceStyle::AlwaysSameLine, false,
         "Brace style for control flow constructs";
@@ -501,7 +501,7 @@ struct_field_align_threshold = 0
 enum_discrim_align_threshold = 0
 match_arm_blocks = true
 force_multiline_blocks = false
-fn_args_density = "Tall"
+fn_args_layout = "Tall"
 brace_style = "SameLineWhere"
 control_brace_style = "AlwaysSameLine"
 trailing_semicolon = true
diff --git a/src/items.rs b/src/items.rs
@@ -2318,7 +2318,7 @@ fn rewrite_args(
         &arg_items,
         context
             .config
-            .fn_args_density()
+            .fn_args_layout()
             .to_list_tactic(arg_items.len()),
         Separator::Comma,
         one_line_budget,
diff --git a/tests/config/small_tabs.toml b/tests/config/small_tabs.toml
@@ -3,7 +3,7 @@ comment_width = 80
 tab_spaces = 2
 newline_style = "Unix"
 brace_style = "SameLineWhere"
-fn_args_density = "Tall"
+fn_args_layout = "Tall"
 trailing_comma = "Vertical"
 indent_style = "Block"
 report_todo = "Always"
diff --git a/tests/source/configs/fn_args_layout/compressed.rs b/tests/source/configs/fn_args_layout/compressed.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_density: Compressed
+// rustfmt-fn_args_layout: Compressed
 // Function arguments density
 
 trait Lorem {
diff --git a/tests/source/configs/fn_args_layout/tall.rs b/tests/source/configs/fn_args_layout/tall.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_density: Tall
+// rustfmt-fn_args_layout: Tall
 // Function arguments density
 
 trait Lorem {
diff --git a/tests/source/configs/fn_args_layout/vertical.rs b/tests/source/configs/fn_args_layout/vertical.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_density: Vertical
+// rustfmt-fn_args_layout: Vertical
 // Function arguments density
 
 trait Lorem {
diff --git 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_density: Vertical
+// rustfmt-fn_args_layout: Vertical
 // rustfmt-brace_style: AlwaysNextLine
 
 // Case with only one variable.
diff --git a/tests/source/fn-custom.rs b/tests/source/fn-custom.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_density: Compressed
+// rustfmt-fn_args_layout: Compressed
 // Test some of the ways function signatures can be customised.
 
 // Test compressed layout of args.
diff --git a/tests/source/fn_args_layout-vertical.rs b/tests/source/fn_args_layout-vertical.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_density: Vertical
+// rustfmt-fn_args_layout: Vertical
 
 // Empty list should stay on one line.
 fn do_bar(
diff --git a/tests/target/configs/fn_args_layout/compressed.rs b/tests/target/configs/fn_args_layout/compressed.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_density: Compressed
+// rustfmt-fn_args_layout: Compressed
 // Function arguments density
 
 trait Lorem {
diff --git a/tests/target/configs/fn_args_layout/tall.rs b/tests/target/configs/fn_args_layout/tall.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_density: Tall
+// rustfmt-fn_args_layout: Tall
 // Function arguments density
 
 trait Lorem {
diff --git a/tests/target/configs/fn_args_layout/vertical.rs b/tests/target/configs/fn_args_layout/vertical.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_density: Vertical
+// rustfmt-fn_args_layout: Vertical
 // Function arguments density
 
 trait Lorem {
diff --git 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_density: Vertical
+// rustfmt-fn_args_layout: Vertical
 // rustfmt-brace_style: AlwaysNextLine
 
 // Case with only one variable.
diff --git a/tests/target/fn-custom.rs b/tests/target/fn-custom.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_density: Compressed
+// rustfmt-fn_args_layout: Compressed
 // Test some of the ways function signatures can be customised.
 
 // Test compressed layout of args.
diff --git a/tests/target/fn_args_layout-vertical.rs b/tests/target/fn_args_layout-vertical.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_density: Vertical
+// rustfmt-fn_args_layout: Vertical
 
 // Empty list should stay on one line.
 fn do_bar() -> u8 {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// rustfmt-fn_args_density: Compressed`
	`1`	`+// rustfmt-fn_args_layout: Compressed`
`2`	`2`	`// Function arguments density`
`3`	`3`
`4`	`4`	`trait Lorem {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// rustfmt-fn_args_density: Tall`
	`1`	`+// rustfmt-fn_args_layout: Tall`
`2`	`2`	`// Function arguments density`
`3`	`3`
`4`	`4`	`trait Lorem {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// rustfmt-fn_args_density: Vertical`
	`1`	`+// rustfmt-fn_args_layout: Vertical`
`2`	`2`	`// Function arguments density`
`3`	`3`
`4`	`4`	`trait Lorem {`