Commit Graph

2491 Commits

Author SHA1 Message Date
topecongiro
9ece82f9ea Add a test for #2190 2017-11-27 13:49:53 +09: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
abfa4a1473
Merge pull request #2184 from topecongiro/issue-2179
Put rhs on the same line as lhs if putting rhs on next line exceeds max width
2017-11-24 20:19:12 +13:00
Nick Cameron
dd1fbca99a Replace various small width heuristics with a single option
Closes #1984
2017-11-24 20:17:06 +13:00
topecongiro
e6ce65b214 Put rhs on the same line as lhs if putting rhs on next line exceeds max width 2017-11-24 12:05:02 +09:00
topecongiro
cb5c3a9914 Add a test for #2179 2017-11-24 12:04:00 +09: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
f891d04c87 Some tests I renamed in a previous commit and forgot to git add 2017-11-24 14:46:33 +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
Nick Cameron
f5dd4591cf
Merge pull request #2181 from topecongiro/issue-2111
Use vertical layout when there are single line comments in import
2017-11-24 11:03:00 +13:00
topecongiro
5314426bc2 Update tests 2017-11-23 12:39:00 +09:00
topecongiro
d92cfff43b Align post comments with items when the it starts with newline 2017-11-23 12:38:34 +09:00
topecongiro
53d7489221 Force vertical layout when we find any kind of single line comments 2017-11-23 12:37:12 +09:00
topecongiro
334b410785 Add a test for #2111 2017-11-23 12:36:57 +09:00
Nick Cameron
643ef24b46 Remove some out of date text from README.md 2017-11-22 07:25:36 +13:00
Nick Cameron
2bfcadf8de
Merge pull request #2174 from topecongiro/changelog
Update changelog
2017-11-21 15:33:03 +13:00
topecongiro
c03d57bad5 Update changelog 2017-11-21 09:06:33 +09:00
Nick Cameron
1952459278 0.2.16 2017-11-21 09:43:33 +13:00
Nick Cameron
b4378a1919
Merge pull request #2172 from topecongiro/issue-2171
Do not squash unsafe block on closure body
2017-11-21 07:07:12 +13:00
topecongiro
6710f0dc9a Do not squash unsafe block 2017-11-20 16:40:58 +09:00
topecongiro
44d81d9e0e Add a test for #2171 2017-11-20 16:38:15 +09:00
Nick Cameron
f987946078
Merge pull request #2161 from topecongiro/issue-1807
Implement RFC style for match pattern
2017-11-20 14:51:53 +13:00
Nick Cameron
d230242e23
Merge pull request #2162 from utkarshkukreti/issue-1753
Fix missing trailing newline in --write-mode=diff.
2017-11-20 14:45:07 +13:00
Nick Cameron
fa794f5808
Merge pull request #2165 from topecongiro/issue-2164
Handle large types on struct fields
2017-11-20 11:51:20 +13:00
Nick Cameron
dc0e17aceb
Merge pull request #2167 from djc/patch-1
Fix typo in Configurations docs
2017-11-20 11:33:12 +13:00
Dirkjan Ochtman
f52dbd5c5e
Fix typo in Configurations docs 2017-11-19 21:14:54 +01:00
topecongiro
bbf061511b Update a test 2017-11-18 15:46:01 +09:00
topecongiro
448991a6f3 Handle multi-lined fn signature 2017-11-18 15:46:01 +09:00
topecongiro
d5152fc8c6 Use choose_rhs() for the layout of multi-lined struct field 2017-11-18 15:45:58 +09:00
topecongiro
3de7a56267 Add a test for #2164 2017-11-18 15:32:10 +09:00
Utkarsh Kukreti
d44d4a3fbc Add test for trailing newline in diff.
Credits to @afshinm for most of the code.
2017-11-17 20:46:17 +05:30
Utkarsh Kukreti
d0df53d833 Fix checkstyle test.
The only reason it passed before was due to a bug in the `diff` crate.
The diff was empty even though the contents of the files were different --
namely one string had a trailing newline character while the other didn't.
Now both have a trailing newline character.
2017-11-17 09:43:47 +05:30
Utkarsh Kukreti
02c024932c Fix missing trailing newline in --write-mode=diff.
This was a bug in the `diff` crate which has been fixed in 0.1.11. This PR
simply bumps `diff` to that version.

Fixes #1753.

    $ xxd main.rs
    00000000: 666e 206d 6169 6e28 2920 7b7d            fn main() {}
    $ cargo run --bin rustfmt -- main.rs --write-mode=diff
    $ echo $?
    0
    $ git checkout issue-1753
    Switched to branch 'issue-1753'
    $ cargo run --bin rustfmt -- main.rs --write-mode=diff
    Diff in /Users/utkarsh/dev/git/rustfmt/main.rs at line 1:
     fn main() {}⏎
    +⏎
    $ echo $?
    4
2017-11-17 08:50:00 +05:30
topecongiro
95d7619e34 Use mixed layout for patterns that are all short 2017-11-16 17:43:36 +09:00
topecongiro
e09a0cc836 Add is_short_pattern() 2017-11-16 17:43:36 +09:00
topecongiro
311a3c526c Fix up write_list() to handle Mixed tactic 2017-11-16 17:43:36 +09:00
topecongiro
35466adbfe Generalize ListItems to allow a separator other than comma 2017-11-16 17:43:36 +09:00
topecongiro
3bd1cc4fe0 Update a test for #1807 2017-11-16 17:43:06 +09:00
topecongiro
1c702aa252 Update tests 2017-11-16 17:43:06 +09:00