Nick Cameron
8b5831b501
Merge pull request #1818 from topecongiro/issue-1194
...
Put braces on the next line if it exceeds max width
2017-07-26 11:40:41 +12:00
Nick Cameron
b831df57af
Merge pull request #1817 from topecongiro/file-lines-tests
...
Restore comments in file-lines tests
2017-07-26 11:36:54 +12:00
topecongiro
d97ecd319d
Update tests
2017-07-25 18:51:29 +09:00
topecongiro
66703e3d6c
Restore comments in file-liens tests
2017-07-25 15:47:44 +09:00
topecongiro
a17993c14a
Force vertical layout when struct_variant_width is 0
2017-07-25 15:19:09 +09:00
Seiichi Uchida
5c99d6c6bc
Update tests
2017-07-25 00:56:09 +09:00
Nick Cameron
b559a0f2f2
Merge pull request #1808 from topecongiro/issue-831
...
Allow block-like rhs expression to stay on the same line with lhs
2017-07-22 16:29:36 +12:00
topecongiro
d7a57d36e7
Update tests
2017-07-22 11:18:59 +09:00
topecongiro
68c6fe70fd
Format source codes and update tests
2017-07-21 17:57:31 +09:00
Nick Cameron
bb27bc5c68
Merge pull request #1806 from topecongiro/item-brace-style
...
Apply item_brace_style to module
2017-07-21 17:58:39 +12:00
topecongiro
3e3d3c00de
Update tests
2017-07-21 13:55:34 +09:00
topecongiro
db5f77b7d0
Consider max_width when rewriting struct in single-line
2017-07-21 07:17:49 +09:00
topecongiro
b233653a22
Cover missing comments between attributes and expressions
2017-07-20 23:58:00 +09:00
Seiichi Uchida
a8b0a6e4c5
Format source codes and update tests
2017-07-20 00:42:00 +09:00
Seiichi Uchida
9777c0de93
Format source codes and update tests
2017-07-20 00:42:00 +09:00
Seiichi Uchida
b78b6e8b09
Format source codes and update tests
2017-07-20 00:42:00 +09:00
Seiichi Uchida
de403f4f65
Use offset_left instead of shrink_left
2017-07-20 00:41:36 +09:00
topecongiro
988e387132
Add imports_indent and imports_layout config options
2017-07-14 09:18:28 +09:00
topecongiro
dcb953b901
Add trailing comma when using Mixed indent style with newline
2017-07-13 20:32:46 +09:00
topecongiro
3bf66436e7
Update tests
2017-07-13 18:43:35 +09:00
Nick Cameron
b37e2664a6
Merge pull request #1786 from euclio/globs
...
add test for root glob imports
2017-07-13 08:15:46 +12:00
Andy Russell
320f18345b
add test for root glob imports
...
Fixes #1472 .
2017-07-12 12:53:02 -04:00
Seiichi Uchida
51641f167e
Do not count the number of parens inside str or comment
2017-07-12 17:17:41 +09: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
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
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
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
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
78224a0644
Update tests
2017-07-10 02:25:26 +09:00
topecongiro
680a3a1d19
Add tests to check alignment don't exceed max_width
2017-07-07 09:04:06 +09:00
topecongiro
a4cce31ea9
Update tests
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
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
cb48435ff3
Format source codes
2017-07-05 18:31:37 +09:00
topecongiro
6a7f866cfe
Format source codes
2017-07-05 18:12:43 +09:00
topecongiro
332cc97986
Use block indent style for struct tuple
2017-07-05 18:00:36 +09:00
Nick Cameron
6546aaf5ec
Merge pull request #1767 from topecongiro/range-with-floating-literal
...
Add a space before range if lhs ends with dot
2017-07-05 15:46:43 +12:00
Nick Cameron
734de8b2b7
Merge pull request #1765 from topecongiro/v-alignment/struct-field
...
Add vertical alignment option for struct fields
2017-07-05 12:11:52 +12:00
topecongiro
183e3482e5
Add a space before range if lhs ends with dot
2017-07-04 20:23:57 +09:00
Nick Cameron
2400f39f98
Merge pull request #1757 from topecongiro/rfc/combine-array
...
Rfc: Combine Array
2017-07-04 18:22:32 +12:00
Nick Cameron
960dd3242a
Merge pull request #1756 from topecongiro/closure_block_indent_threshold
...
Use correct one line budget in rewrite_closure_block
2017-07-04 18:21:11 +12:00
topecongiro
2ed6feca83
Update tests
...
Now structs.rs has no overflowing max_width :)
2017-07-03 18:55:11 +09:00
topecongiro
bd991851c8
Format source codes
2017-07-03 18:54:26 +09:00
topecongiro
c762cf9b43
Update tests
2017-06-29 11:01:22 +09:00
topecongiro
0199e08367
Use correct one line budget in rewrite_closure_block
2017-06-28 10:56:29 +09:00
topecongiro
5f77581763
Put multi-lined index on the next line if it fits in one line
2017-06-26 07:57:06 +09:00
topecongiro
eeb5599b4b
Do not add trailing comma inside macro invocation unless there already is
2017-06-23 13:43:43 +09:00
topecongiro
f062544cdd
Update tests inside macro.rs
...
I moved around some tests in order to prevent rustfmt from failing to format
tests after macro invocations whose arguments cannot be parsed as expressions.
2017-06-23 13:03:37 +09:00
topecongiro
b5a13602d9
Update tests
2017-06-20 22:35:16 +09:00
Seiichi Uchida
f74be44b1c
Merge pull request #1732 from olson-sean-k/issue-1377
...
Keep brace on same line as `match` when using `ClosingNextLine`.
2017-06-20 12:07:03 +09:00
Nick Cameron
1ebbc3cd68
Merge pull request #1734 from topecongiro/raw-string-literal
...
Allow extending a chain after raw string literal
2017-06-20 12:29:25 +12:00
Nick Cameron
779f037c8d
Merge pull request #1728 from topecongiro/trailing-comma
...
Apply config.trailing_comma wherever possible
2017-06-20 12:22:58 +12:00
Sean Olson
ea1df1777b
Modify control_brace_sytle test to ensure match braces are formatted correctly.
2017-06-19 08:12:15 -07:00
Seiichi Uchida
b99f3cb447
Allow extending a chain after raw string literal
2017-06-19 22:06:08 +09:00
topecongiro
512c8c1edf
Apply config.trailing_comma wherever possible
2017-06-19 16:00:04 +09:00
topecongiro
ec4b439484
Disallow overflowing closure if there are multiple closures in args
2017-06-19 12:07:20 +09:00
topecongiro
482675cf58
Update tests
2017-06-19 11:25:21 +09:00
Seiichi Uchida
6afb0e856c
Avoid line break when rhs of assignment is an invalid macro
2017-06-18 14:25:21 +09:00
Nick Cameron
be18e7af90
Merge pull request #1717 from topecongiro/type-and-generics
...
Refactor format against types and generics
2017-06-18 15:57:34 +12:00
Seiichi Uchida
4d11faff4b
Update tests
2017-06-18 02:16:27 +09:00
topecongiro
0440c2c377
Update tests
2017-06-17 16:57:00 +09:00
topecongiro
e31f5eceac
Use correct span for Infer type inside closure header
2017-06-17 15:35:29 +09:00
topecongiro
897d7bdcb9
Add a test for #1697
2017-06-17 15:26:59 +09:00
topecongiro
9b73490491
Update tests
2017-06-17 15:26:59 +09:00
Nick Cameron
06f351664b
Merge pull request #1705 from topecongiro/issue-1703
...
Preserve comments inside attributes
2017-06-17 16:58:11 +12:00
topecongiro
f60a810730
Preserve comments inside attributes
2017-06-17 05:44:54 +09:00
topecongiro
4a5871eccc
Use correct indentaion for vec! with semicolon
2017-06-16 13:57:37 +09:00
Nick Cameron
c5538d2a58
Merge pull request #1692 from topecongiro/chain/last-item
...
Allow overflowing the last item of chain only if it is multi-lined
2017-06-16 13:24:03 +12:00
topecongiro
208ff15954
Format source codes
2017-06-16 08:49:49 +09:00
topecongiro
e7240f5e24
Add and remove comments
2017-06-16 08:28:12 +09:00
topecongiro
0d5768964b
Format source codes and add a test
2017-06-16 07:36:31 +09:00
topecongiro
de10113c74
Update tests
...
Add more patterns and types
2017-06-15 16:55:31 +09:00
Nick Cameron
a1fdc32d99
Merge pull request #1673 from topecongiro/get-tests-passing-again
...
Get tests passing again
2017-06-15 10:39:29 +12:00
topecongiro
b8f11a4e3c
Format source codes
2017-06-14 20:39:07 +09:00
topecongiro
dacb1ba050
Update tests
2017-06-14 09:30:04 +09:00
topecongiro
6047179ab0
Update tests
2017-06-14 00:09:17 +09:00
Nick Cameron
18ccd0190e
Rebasing
2017-06-13 14:49:47 +12:00
Nick Cameron
6f30d9e7c9
Reformat tests
2017-06-13 14:42:54 +12:00
topecongiro
f084a8af96
Fix excessive indentation in trait where clause when using Rfc style
2017-06-13 10:18:55 +09:00
Nick Cameron
5531a93b57
Merge pull request #1657 from topecongiro/issue-1656
...
Put match arm's guard on new line if it exceeds max width
2017-06-13 11:58:16 +12:00
Nick Cameron
5d78d1fe00
Merge pull request #1655 from topecongiro/issue-1652
...
Use correct indent for return type when it goes multi line
2017-06-13 11:57:30 +12:00
Nick Cameron
c07925f498
Merge pull request #1647 from topecongiro/refactor-impl-format
...
Refactor impl format
2017-06-13 11:55:33 +12:00
Nick Cameron
6ed3077651
Merge pull request #1654 from topecongiro/over-long-lines
...
Use block indent for args of macro if single line args exceeds max width
2017-06-13 09:41:59 +12:00
topecongiro
57fc39305d
Put guard on newline if it exceeds max width
2017-06-12 17:25:38 +09:00
topecongiro
d269189f19
Use correct indent for return type when it goes multi line
2017-06-12 16:23:10 +09:00
topecongiro
9ad499786d
Use block indent for args if single line args exceeds max width
2017-06-12 15:58:27 +09:00
Nick Cameron
272b0b6f49
Merge pull request #1649 from topecongiro/issue-1648
...
Add offset to struct literal fields when `struct_lit_style` is `"Visual"`
2017-06-12 10:39:28 +12:00
topecongiro
e94fcfcd39
Update tests
2017-06-11 23:27:02 +09:00
Seiichi Uchida
f2838595d5
Add visual offset when using struct_lit_style is Visual
2017-06-10 22:20:11 +09:00
topecongiro
bd80077be8
Add format_trait_ref_then_update_result
2017-06-10 21:07:38 +09:00
topecongiro
9eefc6fc8d
Share codes when rewriting generics
2017-06-10 18:31:01 +09:00
topecongiro
c92064c30a
Force brace on new line if the signature ends with comment
2017-06-09 16:15:31 +09:00
est31
4665943b51
Fix the pub-restricted tests
2017-06-06 07:32:07 +02:00
Nick Cameron
2dc1de9307
Update a test
2017-06-06 07:32:06 +02:00
topecongiro
27da80324c
Implement catch
2017-06-06 07:32:06 +02:00
Nick Cameron
8ac9245df4
Merge pull request #1634 from topecongiro/impl-rewrite-attribute
...
Implement Rewrite trait for syntax::ast::Attribute
2017-06-06 17:11:10 +12:00
topecongiro
7be703a637
Implement Rewrite trait for syntax::ast::Attribute
2017-06-06 13:55:34 +09:00
Nick Cameron
6a9d7dab0d
Merge pull request #1637 from est31/master
...
Add config options for spaces around the colon in struct literal fields
2017-06-06 16:20:16 +12:00
Nick Cameron
130aa70e3a
Merge pull request #1621 from topecongiro/combining
...
Combine more expressions
2017-06-06 14:52:48 +12:00
est31
aa4cd311bb
Add config options for spaces around the colon in struct literal fields
...
In Rust, colons are used for three purposes:
* Type annotations, including type ascription
* Trait bounds
* Struct literal fields
This commit adds options for the last missing of the three purposes,
struct literal fields.
2017-06-06 03:50:58 +02:00
topecongiro
41b7cc6a73
Set combine_control_expr to false by default and true in rfc-rustfmt
2017-06-05 15:31:44 +09:00
Nick Cameron
d04ab9e5ba
Merge pull request #1630 from topecongiro/issue-1115
...
Allow comments after attributes on enum fields
2017-06-05 11:41:52 +12:00
Nick Cameron
14a1ea8193
Merge pull request #1629 from topecongiro/issue-982
...
Use recover_comment_removed in rewrite_static
2017-06-05 11:37:21 +12:00
topecongiro
d7de5b7656
Allow comments after attributes on enum fields
2017-06-04 23:27:21 +09:00
topecongiro
62d200d9cf
Update tests
2017-06-04 19:35:29 +09:00
topecongiro
d54634bd7c
Use recover_comment_removed in rewrite_static
2017-06-04 18:44:08 +09:00
Nick Cameron
3e25e628a1
Merge pull request #1619 from topecongiro/config/format_if_else_cond_comment
...
Add format_if_else_cond_comment config option
2017-06-04 15:26:26 +12:00
Nick Cameron
6f1cb950d6
Merge pull request #1628 from topecongiro/issue-1113
...
Preserve the layout of comment after return type
2017-06-04 11:40:37 +12:00
Nick Cameron
3090086000
Merge pull request #1627 from topecongiro/issue-1624
...
Refactor vertical layout of function definition with options
2017-06-04 11:34:25 +12:00
topecongiro
15e936bfc7
Preserve the layout of comment after return type
2017-06-04 06:59:55 +09:00
Seiichi Uchida
dd13761f85
Organize vertical layout of function definition
2017-06-03 23:18:39 +09:00
Seiichi Uchida
d21792a730
Put opening paren next to multi line generic
2017-06-03 23:16:29 +09:00
Seiichi Uchida
08b5375776
Forbid trailing comma at the end of args of variadic functions
2017-06-03 15:03:08 +09:00
topecongiro
aadd3e11f4
Unindent comment on top of else
2017-06-02 11:58:58 +09:00
Nick Cameron
cdc3f9321c
Rename the Style::Default option to Legacy
2017-06-02 11:44:38 +12:00
Nick Cameron
0480f7e105
Merge pull request #1620 from topecongiro/rfc-if
...
Use correct line budget when using Rfc control style
2017-06-02 11:36:16 +12:00
topecongiro
fbd4b87329
Use correct one line budget when using Rfc control style
2017-06-01 19:59:50 +09:00
Seiichi Uchida
789abf063d
Use block indent style when visual indent failed
2017-06-01 12:08:20 +09:00
Nick Cameron
4d0ee80e61
Merge pull request #1609 from topecongiro/nested-tuple
...
Put a space between nested tuple field
2017-05-31 11:58:03 +12:00
topecongiro
b63e3aaa83
Put a space between nested tuple field
2017-05-30 20:40:05 +09:00
Nick Cameron
cfa3d59974
Merge pull request #1608 from topecongiro/issue-1598
...
Fix index bug in write_snippet_inner
2017-05-30 15:28:44 +12:00
topecongiro
33a7357543
Fix index bug in write_snippet_inner
2017-05-30 10:53:48 +09:00
topecongiro
924a9b5cb6
Allow longer custom comment
2017-05-30 08:46:25 +09:00
Nick Cameron
b79094262f
Merge pull request #1604 from topecongiro/comment-group
...
Format comments with different opening in different manner
2017-05-30 08:53:22 +12:00
topecongiro
bcebe9e7de
Use different style when rewriting comment with different opener
2017-05-29 11:28:48 +09:00
Nick Cameron
9b79cb5c22
Merge pull request #1602 from topecongiro/attributes-on-expressions
...
Allow attributes on expressions
2017-05-28 18:34:50 +12:00
topecongiro
72c04facd2
Add tests for issues which can be closed on the current master
...
This PR adds tests for #325 , #1092 , #1214 , #1278 , #1329 and #1427 .
2017-05-28 13:24:05 +09:00
topecongiro
99c2eab5ac
Allow attributes on expressions
2017-05-28 11:44:41 +09:00
Seiichi Uchida
4402412b78
Allow attributes in generics of impl
2017-05-27 23:59:29 +09:00
Nick Cameron
8ac3fc36cc
Merge pull request #1597 from topecongiro/comments-after-attributes
...
Allow comments after attributes of struct fields
2017-05-27 13:47:42 +12:00
Nick Cameron
aad250e20e
Merge pull request #1596 from topecongiro/issue-1595
...
Add a trailing comma if the last arg ends with comment
2017-05-27 13:38:14 +12:00
Nick Cameron
2dc4298b71
Merge pull request #1593 from topecongiro/issue-1439
...
Allow comments after where clause
2017-05-27 13:34:50 +12:00
Nick Cameron
4e5df80c03
Merge pull request #1588 from topecongiro/nesting-macro
...
Allow macro to be nested like function call
2017-05-27 13:28:47 +12:00
topecongiro
b6c503ac32
Allow comments after attributes of struct fields
2017-05-27 09:36:25 +09:00
topecongiro
67e8a690ff
Add a trailing comma if the last arg ends with comment
2017-05-27 07:33:06 +09:00
topecongiro
dab14b4485
Allow comments after where clause
2017-05-27 02:07:58 +09:00
topecongiro
fcffe854b8
Allow default associated types
2017-05-26 17:17:12 +09:00
topecongiro
554605d47c
Format source codes and add tests
2017-05-26 16:40:19 +09:00
topecongiro
0869bca85a
Put closing paren on the next line when the last arg contains comment
2017-05-26 13:15:10 +09:00
Nick Cameron
3d135ebba4
Merge pull request #1586 from topecongiro/minor
...
Fix minor bugs
2017-05-26 08:43:52 +12:00
Seiichi Uchida
92270ba191
Add offset when rewriting index
2017-05-25 23:01:41 +09:00
Seiichi Uchida
189b6bd7bb
Update tests
2017-05-25 22:55:33 +09:00
topecongiro
986abc24b4
Add a test for #1380
2017-05-25 16:30:45 +09:00
