Commit Graph

1977 Commits

Author SHA1 Message Date
Nick Cameron
69bdc86580 Merge pull request #1779 from topecongiro/issue-1777
Do not count the number of parens inside str or comment
2017-07-12 20:41:21 +12:00
Seiichi Uchida
51641f167e Do not count the number of parens inside str or comment 2017-07-12 17:17:41 +09:00
Nick Cameron
43af9c84b1 Merge pull request #1783 from topecongiro/trailing-semicolon
Add trailing_semicolon config option
2017-07-12 17:34:13 +12:00
topecongiro
2fb66cd1d3 Add trailing_semicolon config option
trailing_semicolon controls whether to add a trailing semicolon after break,
continue and return.
2017-07-12 14:16:06 +09:00
Nick Cameron
2725636f58 Merge pull request #1782 from topecongiro/rfc/combining-match-arm
Rfc: combining match arm
2017-07-12 16:23:18 +12:00
topecongiro
c11aac04a3 Update wrap_match_arms option tests and visual guide 2017-07-11 21:53:57 +09:00
topecongiro
be55f856bb Update tests 2017-07-11 21:53:48 +09:00
topecongiro
e3310a6a18 Format source codes 2017-07-11 21:53:10 +09:00
topecongiro
08f3f03353 Implement combining against match arms 2017-07-11 21:52:27 +09:00
Nick Cameron
3552595a3b Merge pull request #1780 from topecongiro/rfc/union
Format union
2017-07-11 16:16:35 +12:00
Nick Cameron
4cfc2bfbd4 Merge pull request #1778 from topecongiro/rfc/match-arm-multiline-pattern
Rfc: fix up match arm pattern
2017-07-11 16:11:09 +12:00
Seiichi Uchida
bc90a12b8d Format union 2017-07-10 17:26:55 +09:00
topecongiro
7cbc48ae32 Update tests 2017-07-10 16:52:55 +09:00
topecongiro
76228e81de Format source codes 2017-07-10 16:52:50 +09:00
topecongiro
d1e124b03a Fix up rewriting match arm pattern 2017-07-10 16:52:07 +09:00
Nick Cameron
5350f71f41 Merge pull request #1776 from topecongiro/poor-formatting/index-budget
Use correct one line budget when rewriting index
2017-07-10 17:52:23 +12:00
Nick Cameron
588d119555 Merge pull request #1772 from topecongiro/recover-removed-comment
Recover removed comment before and after `where`
2017-07-10 17:51:35 +12:00
topecongiro
65790f2b2a Cover missing comments before and after where 2017-07-10 14:38:16 +09:00
topecongiro
7ab4bdfd85 Use correct one line budget when rewriting index 2017-07-10 14:23:29 +09:00
Seiichi Uchida
8b681e06fd Update README.md: add 'rustup update' 2017-07-10 13:46:36 +09:00
Nick Cameron
0a42648678 Merge pull request #1775 from topecongiro/rfc/patterns
RFC: patterns in condition and match arm
2017-07-10 16:22:01 +12:00
Nick Cameron
ed90489871 cargo update 2017-07-10 16:18:41 +12:00
Seiichi Uchida
78224a0644 Update tests 2017-07-10 02:25:26 +09:00
Seiichi Uchida
bc63d69c3f Format source codes 2017-07-10 02:24:59 +09:00
Seiichi Uchida
588700c3dc Refactor rewrite_assign_rhs
1. Stop using mut var
2. Use block indent when breaking lines
2017-07-10 02:22:59 +09:00
Seiichi Uchida
e355c85b42 Use rewrite_assign_rhs for rewriting pattern in condition 2017-07-10 02:22:15 +09:00
Seiichi Uchida
b897310d79 Prefer to put the whole pattern of match arm on one line 2017-07-10 02:20:28 +09:00
Seiichi Uchida
72b155a9e2 Implement rhs_overhead method against Shape 2017-07-10 02:16:57 +09:00
Nick Cameron
7333dfc95b Merge branch 'master' of https://github.com/petrochenkov/rustfmt into petrochenkov-master 2017-07-08 11:22:53 +12:00
Vadim Petrochenkov
d4c8a17665 Update rustfmt for ast::ExprKind::MethodCall changes 2017-07-07 15:52:23 +03:00
Nick Cameron
569b3e3465 Merge pull request #1769 from topecongiro/comment-vertical-alignment
Comment vertical alignment
2017-07-07 16:50:46 +12:00
topecongiro
680a3a1d19 Add tests to check alignment don't exceed max_width 2017-07-07 09:04:06 +09:00
topecongiro
f7ec959c97 Use closure instead of declaring function
Take comment overhead into account
2017-07-07 09:04:06 +09:00
topecongiro
a4cce31ea9 Update tests 2017-07-07 09:04:06 +09:00
topecongiro
57466dc687 Format source codes 2017-07-07 09:04:06 +09:00
topecongiro
1de786a79a Implement vertical alignment for comments after list structure 2017-07-07 09:04:06 +09:00
topecongiro
2dd8d6d097 Add Clone trait bound to write_list 2017-07-07 09:04:06 +09:00
Nick Cameron
cfec7ad593 Merge pull request #1745 from topecongiro/assignment
Put rhs of assignment on the next line if it fits in a single line
2017-07-07 11:54:06 +12:00
Nick Cameron
b9a1938098 Merge pull request #1768 from topecongiro/huge-array
Add array_horizontal_layout_threshold option
2017-07-07 06:48:48 +12:00
Nick Cameron
6b0035327c Merge pull request #1746 from topecongiro/struct-tuple
RFC: Use block indent style for struct tuple
2017-07-06 08:16:10 +12:00
topecongiro
8e8e7a4215 Add array_horizontal_layout_threshold option 2017-07-06 01:19:36 +09:00
topecongiro
4bd6761caf Update tests 2017-07-06 01:19:31 +09:00
topecongiro
d613f75676 Use correct one line budget for array in Block indent style 2017-07-05 19:19:54 +09:00
topecongiro
cb48435ff3 Format source codes 2017-07-05 18:31:37 +09:00
topecongiro
0237347abc Update heuristic in rewrite_assign_rhs
Put the rhs of assignement on the next line when putting next to `lhs = ` will
cause rhs to go multi line, but putting on the next line makes it fits
in a single line.
2017-07-05 18:30:11 +09:00
topecongiro
101df143cf Refactor rewrite_static 2017-07-05 18:25:50 +09:00
topecongiro
6a7f866cfe Format source codes 2017-07-05 18:12:43 +09:00
topecongiro
f8586bac2a Handle comment at the last element in write_list 2017-07-05 18:01:34 +09:00
topecongiro
be5c40cbb9 Handle very long struct 2017-07-05 18:00:36 +09:00
topecongiro
332cc97986 Use block indent style for struct tuple 2017-07-05 18:00:36 +09:00