bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename fn_args_layout to fn_args_density

Browse source
This commit is contained in:
Nick Cameron 2015-09-02 08:56:37 +12:00
parent 6ca2756a82
commit f81485d9d6
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/config.rs
View file

@ -89,7 +89,7 @@ create_config! {
fn_brace_style: BraceStyle, fn_brace_style: BraceStyle,
fn_return_indent: ReturnIndent, fn_return_indent: ReturnIndent,
fn_args_paren_newline: bool, fn_args_paren_newline: bool,
fn_args_layout: Density, fn_args_density: Density,
fn_arg_indent: BlockIndentStyle, fn_arg_indent: BlockIndentStyle,
where_density: Density, // Should we at least try to put the where clause on the same line as where_density: Density, // Should we at least try to put the where clause on the same line as
// the rest of the function decl? // the rest of the function decl?
@ -122,7 +122,7 @@ impl Default for Config {
fn_brace_style: BraceStyle::SameLineWhere, fn_brace_style: BraceStyle::SameLineWhere,
fn_return_indent: ReturnIndent::WithArgs, fn_return_indent: ReturnIndent::WithArgs,
fn_args_paren_newline: true, fn_args_paren_newline: true,
fn_args_layout: Density::Tall, fn_args_density: Density::Tall,
fn_arg_indent: BlockIndentStyle::Visual, fn_arg_indent: BlockIndentStyle::Visual,
where_density: Density::Tall, where_density: Density::Tall,
where_indent: BlockIndentStyle::Tabbed, where_indent: BlockIndentStyle::Tabbed,

2
src/items.rs
View file

@ -363,7 +363,7 @@ impl<'a> FmtVisitor<'a> {
}; };
let fmt = ListFormatting { let fmt = ListFormatting {
tactic: self.config.fn_args_layout.to_list_tactic(), tactic: self.config.fn_args_density.to_list_tactic(),
separator: ",", separator: ",",
trailing_separator: SeparatorTactic::Never, trailing_separator: SeparatorTactic::Never,
indent: indent, indent: indent,

2
tests/config/small_tabs.toml
View file

@ -6,7 +6,7 @@ newline_style = "Unix"
fn_brace_style = "SameLineWhere" fn_brace_style = "SameLineWhere"
fn_return_indent = "WithArgs" fn_return_indent = "WithArgs"
fn_args_paren_newline = true fn_args_paren_newline = true
fn_args_layout = "Tall" fn_args_density = "Tall"
fn_arg_indent = "Visual" fn_arg_indent = "Visual"
where_density = "Tall" where_density = "Tall"
where_indent = "Tabbed" where_indent = "Tabbed"

2
tests/source/fn-custom.rs
View file

@ -1,4 +1,4 @@
// rustfmt-fn_args_layout: Compressed // rustfmt-fn_args_density: Compressed
// Test some of the ways function signatures can be customised. // Test some of the ways function signatures can be customised.
// Test compressed layout of args. // Test compressed layout of args.

2
tests/target/fn-custom.rs
View file

@ -1,4 +1,4 @@
// rustfmt-fn_args_layout: Compressed // rustfmt-fn_args_density: Compressed
// Test some of the ways function signatures can be customised. // Test some of the ways function signatures can be customised.
// Test compressed layout of args. // Test compressed layout of args.