Commit Graph

2722 Commits

Author SHA1 Message Date
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
topecongiro
59ebde26f7 Cargo fmt 2017-11-21 08:52:43 +09:00
topecongiro
34b0c9cf3f Do not give up when we run out of space when choosing rhs 2017-11-21 08:52:11 +09:00
topecongiro
c2804589a1 Add a test for assignment whose lhs is exactly 100 chars 2017-11-21 08:50:55 +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
topecongiro
34c2499029 Cargo fmt 2017-11-16 17:43:06 +09:00
topecongiro
09d54512da Break before '|' for multi-lined match arm pattern 2017-11-16 17:43:06 +09:00
Nick Cameron
abe6eec910
Merge pull request #2160 from topecongiro/issue-1809
Force vertical layout for all variants if one of then use multiple lines
2017-11-16 20:59:17 +13:00
topecongiro
b1a6dd6b83 Cargo fmr & update tests
Note that we are forcing vertical layout when there are attributes on top of a
variant.
2017-11-16 16:07:15 +09:00
topecongiro
8ef54293e8 Force vertical layout for all variants if one of then use multiple lines 2017-11-16 16:02:01 +09:00
topecongiro
b3a3d5b164 Add a test for #1809 2017-11-16 16:01:50 +09:00
Nick Cameron
d4fdaec473
Merge pull request #2159 from topecongiro/issue-2158
Prevent long associated type from overflowing max width
2017-11-16 15:59:32 +13:00
topecongiro
f7ef1f681c Use rewrite_assign_rhs() when rewriting associated type 2017-11-16 11:31:09 +09:00
topecongiro
4cd2e6f39a Generalize rewrite_assign_rhs() 2017-11-16 11:26:36 +09:00
topecongiro
37b6855d9d Add a test for #2158 2017-11-16 11:26:12 +09:00
Nick Cameron
c0e537d227
Merge pull request #2155 from topecongiro/issue-1603
Prevent panicking by a nested comment
2017-11-15 21:17:33 +13:00
topecongiro
95c7325ac2 Do not get tricked by a nested comment 2017-11-15 15:46:00 +09:00
topecongiro
f9f4ef8177 Add a test for #1603 2017-11-15 15:44:27 +09:00
Seiichi Uchida
1a69aebe6c
Update README.md 2017-11-15 15:19:32 +09:00
Nick Cameron
5a91e0f7e3
Merge pull request #2154 from topecongiro/issue-2151
Look for a newline after match arm only when there is one
2017-11-15 16:46:15 +13:00
topecongiro
1dc9b927af Update tests 2017-11-15 12:22:50 +09:00
topecongiro
37b1779426 Look for a newline after match arm only when there is one 2017-11-15 12:22:50 +09:00
topecongiro
bf775785e0 Add a test for #2151 2017-11-15 12:22:50 +09:00
Nick Cameron
a90b76a731
Merge pull request #2153 from topecongiro/issue-2152
Return None when a literal exceeds budget
2017-11-15 15:43:03 +13:00