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
Nick Cameron
f76b937e93
Merge pull request #2150 from topecongiro/audit-options/space
...
Combine spacing-related config options into a single general one
2017-11-15 14:52:38 +13:00
topecongiro
bdb8f369e8
Return None when a literal exceeds budget
2017-11-15 10:36:49 +09:00
topecongiro
00318c400b
Add a test for #2152
2017-11-15 10:36:42 +09:00
topecongiro
4e7c2756d3
Update Configurations.md
2017-11-14 23:47:30 +09:00
topecongiro
bc543cce0b
Combine spaces_within_parens and spaces_within_brackets
2017-11-14 23:42:31 +09:00
topecongiro
94e22bb334
Fix typos
2017-11-14 23:41:33 +09:00
topecongiro
575ae22a5f
Update tests related to spaces with parens and brackets
2017-11-14 23:37:27 +09:00
topecongiro
babc479783
Use space_before_colon and space_after_colon
2017-11-14 23:25:36 +09:00
topecongiro
15ded04f46
Update tests related to colon spacing
2017-11-14 23:25:10 +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
707a296377
Update Configurations.md
2017-11-14 10:49:18 +09:00
topecongiro
f8074b340d
Combine fn_brace_style and item_brace_style
2017-11-14 10:47:02 +09:00
Nick Cameron
bf15438ab4
Merge pull request #2147 from topecongiro/audit-options/indent_style
...
Use 'indent_style' for all indent related settings
2017-11-14 13:50:43 +13:00
topecongiro
9a58741f29
Remove duplicated 'indent_style' section
2017-11-14 09:31:50 +09:00
clippered
794a215b27
rename to use_colored_tty; used match as well
2017-11-13 20:18:05 +11:00
clippered
d2f2f25463
add cli option for color
2017-11-13 20:18:03 +11:00
topecongiro
a770c0e345
Fix chains-visual test
2017-11-13 17:37:56 +09:00
topecongiro
f3aba5d1df
Update Configurations.md
2017-11-13 17:33:32 +09:00
