225 Commits

Author SHA1 Message Date
Nick Cameron
677446e99d Merge fn_empty_single_line and impl_empty_single_line into empty_item_single_line 2017-11-27 17:46:09 +13:00
Nick Cameron
9a33255834 Rename wrap_match_arms to match_arm_blocks 2017-11-27 17:35:27 +13:00
Nick Cameron
8f4d85a9d7 Merge multiline_closure_forces_block and multiline_match_arm_forces_block into force_multiline_block 2017-11-27 17:03:54 +13:00
Nick Cameron
087f8b5854 Remove match_arm_forces_newline 2017-11-27 16:31:49 +13:00
Nick Cameron
0e1fa2c244 Remove indent_match_arms 2017-11-27 15:49:14 +13:00
Nick Cameron
86007e7d17 Remove where_density and where_layout options
There is a choice between block and visual indent for where clauses, plus the
single line option. I think these two are too fine-grained to be useful.
2017-11-24 21:08:24 +13:00
Nick Cameron
dd1fbca99a Replace various small width heuristics with a single option
Closes #1984
2017-11-24 20:17:06 +13:00
Nick Cameron
96886cd67f Fix a typo in the unstable options handling and address fallout 2017-11-24 15:41:27 +13:00
Nick Cameron
e5bcb2259a Reorganise config options and stabilise a few 2017-11-24 15:41:27 +13:00
Nick Cameron
45d4f7a2dd struct_lit_multiline_style -> struct_lit_single_line (and make it a bool) 2017-11-24 14:45:18 +13:00
Nick Cameron
20805acf42 Merge attributes_on_same_line_as_field and attributes_on_same_line_as_variant into same_line_attributes 2017-11-24 14:29:44 +13:00
Nick Cameron
d00c60df5c Remove chain_split_single_child option 2017-11-24 14:12:54 +13:00
Nick Cameron
4cb474b5ee Remove force_format_strings in favour of format_strings 2017-11-24 14:07:37 +13:00
Nick Cameron
8a7b6b8806 Remove match_pattern_separator_break_point in favour of binop_separator 2017-11-24 14:01:44 +13:00
Nick Cameron
179b3c59de Remove legacy option fn_args_paren_newline 2017-11-24 13:27:14 +13:00
Nick Cameron
4f65124422 Remove legacy option fn_return_indent 2017-11-24 13:19:36 +13:00
Nick Cameron
d0f12b8ec8 Remove unused option take_source_hints 2017-11-24 13:08:02 +13:00
topecongiro
09d54512da Break before '|' for multi-lined match arm pattern 2017-11-16 17:43:06 +09:00
topecongiro
bc543cce0b Combine spaces_within_parens and spaces_within_brackets 2017-11-14 23:42:31 +09:00
topecongiro
babc479783 Use space_before_colon and space_after_colon 2017-11-14 23:25:36 +09:00
Nick Cameron
6a6e9a22bc
Merge pull request #2148 from topecongiro/audit-option/brace_style
Combine fn_brace_style and item_brace_style
2017-11-14 16:57:09 +13:00
Nick Cameron
be76476421
Merge pull request #2137 from clippered/add-color-cli-option
add cli option for color
2017-11-14 15:11:31 +13:00
topecongiro
f8074b340d Combine fn_brace_style and item_brace_style 2017-11-14 10:47:02 +09:00
clippered
d2f2f25463 add cli option for color 2017-11-13 20:18:03 +11:00
topecongiro
04f09c9d85 Replace '*_indent' with 'indent_style' in src 2017-11-13 17:33:32 +09:00
Nick Cameron
e6800bf27d remove closure_block_indent_threshold option 2017-11-13 15:40:54 +13:00
topecongiro
b023cc831c Remove static lifetime 2017-11-06 13:52:25 +09:00
topecongiro
fc4a51a242 Prefer println!() to println!("") 2017-11-06 13:52:25 +09:00
Afshin Mehrabani
f412c875ea Adding where_single_line option (#2030)
* feat(where): adding where_single_line option and tests

* fix(where): adding more tests

* feat(where): changing the shape of where clause when where_single_line is true

* feat: newline_for_brace should avoid adding a new line where where_single_line is true

* fix(items): where_single_line should bypass the multi-item where clauses

* fix(items): refactoring and removing redundant variables

* fix(items): where_single_line should not be functional when args are multilined

* fix(config): fixing conflict with upstream
2017-11-06 11:53:17 +13:00
Nick Cameron
f1035d9782
Merge pull request #2116 from topecongiro/config-options-indent
Rename config options related to indent
2017-11-06 08:43:12 +13:00
topecongiro
40c5666af6 Rename 'struct_lit_style' to 'struct_lit_indent' 2017-11-04 22:47:28 +09:00
topecongiro
d5d8740993 Rename 'fn_call_style' to 'fn_call_indent' 2017-11-04 22:46:40 +09:00
topecongiro
55c2000d94 Rename 'fn_args_layout' to 'fn_args_indent' 2017-11-04 22:45:47 +09:00
topecongiro
5096cdff56 Rename 'array_layout' to 'array_indent' 2017-11-04 22:45:09 +09:00
topecongiro
d287b06eba Rename 'chain_one_line_max' to 'chain_width' 2017-11-04 22:24:43 +09:00
Nick Cameron
9bf81f9d12 Remove LicensePolicy (dead code)
Fixes #1320
2017-11-03 08:43:33 +13:00
Martin Lindhe
f930a16b8d fix some typos 2017-11-01 07:33:55 +01:00
Tarin Mahmood
685c9d332f Unstable options added 2017-10-28 16:26:33 +06:00
Ömer Sinan Ağacan
abf8f43233 Implement match_arm_forces_newline option (#2039) 2017-10-26 20:20:36 +03:00
Douglas Anderson
ac33472d36 Fix typo in --config-help "funciton" -> "function" 2017-10-22 00:47:45 -06:00
Jorge Aparicio
77584e507c default required-version to the current rustfmt version 2017-10-10 22:37:47 +02:00
Jorge Aparicio
0c36c59175 add required-version option to rustfmt.toml
This option specifies the rustfmt version that *must* be used to format the code. Trying to use a
different version raises an error.

closes #1505
2017-10-09 23:07:53 +02:00
topecongiro
d55b3492c0 Rename binop_sep to binop_separator 2017-09-15 15:05:41 +09:00
topecongiro
45e48ec424 Add a new config option to control the placement of a binary operator 2017-09-15 12:10:30 +09:00
Seiichi Uchida
9d49bd22f0 Add explicit lifetime 2017-08-31 13:24:32 +09:00
Seiichi Uchida
4b79055a15 Apply refactoring from cargo clippy 2017-08-31 12:49:12 +09:00
topecongiro
5dafcc24e4 Add merge_derives config option 2017-08-24 22:29:56 +09:00
Michael Smith
411c73c12f
Add multiline_{closure,match_arm}_forces_block
multiline_closure_forces_block = false (default):
    result.and_then(|maybe_value| match maybe_value {
        None => ...,
        Some(value) => ...,
    })

multiline_closure_forces_block = true:
    result.and_then(|maybe_value| {
        match maybe_value {
            None => ...,
            Some(value) => ...,
        }
    })

multiline_match_arm_forces_block = false (default):
    match lorem {
        None => if ipsum {
            println!("Hello World");
        },
        Some(dolor) => ...,
    }

multiline_match_arm_forces_block = true:
    match lorem {
        None => {
            if ipsum {
                println!("Hello World");
            }
        }
        Some(dolor) => ...,
    }
2017-08-21 14:05:20 -07:00
Nick Cameron
7e171836c6 Merge pull request #1900 from spinda/attributes-on-same-line
Add attributes_on_same_line_as_{field,variant} configs
2017-08-21 11:26:36 +12:00
Michael Smith
1c9d044c05
Add attributes_on_same_line_as_{field,variant} 2017-08-19 15:09:10 -07:00