]> git.lizzy.rs Git - rust.git/log
rust.git
7 years agoDo not overwrite files when there are no diffs in Overwrite mode
topecongiro [Tue, 6 Jun 2017 06:33:46 +0000 (15:33 +0900)]
Do not overwrite files when there are no diffs in Overwrite mode

7 years agoMerge pull request #1637 from est31/master
Nick Cameron [Tue, 6 Jun 2017 04:20:16 +0000 (16:20 +1200)]
Merge pull request #1637 from est31/master

Add config options for spaces around the colon in struct literal fields

7 years agoMerge pull request #1633 from topecongiro/rfc/control-style
Nick Cameron [Tue, 6 Jun 2017 02:54:28 +0000 (14:54 +1200)]
Merge pull request #1633 from topecongiro/rfc/control-style

Do not add offset to match pattern when using Rfc style

7 years agoMerge pull request #1631 from topecongiro/fix-appveyor
Nick Cameron [Tue, 6 Jun 2017 02:53:31 +0000 (14:53 +1200)]
Merge pull request #1631 from topecongiro/fix-appveyor

Update appveyor.yml

7 years agoMerge pull request #1621 from topecongiro/combining
Nick Cameron [Tue, 6 Jun 2017 02:52:48 +0000 (14:52 +1200)]
Merge pull request #1621 from topecongiro/combining

Combine more expressions

7 years agoAdd config options for spaces around the colon in struct literal fields
est31 [Tue, 6 Jun 2017 01:11:17 +0000 (03:11 +0200)]
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.

7 years agoDo not add offset to match pattern when using Rfc style
topecongiro [Mon, 5 Jun 2017 08:57:43 +0000 (17:57 +0900)]
Do not add offset to match pattern when using Rfc style

7 years agoUpdate appveyor.yml
Seiichi Uchida [Mon, 5 Jun 2017 07:19:01 +0000 (16:19 +0900)]
Update appveyor.yml

7 years agoFormat source codes
topecongiro [Mon, 5 Jun 2017 06:32:21 +0000 (15:32 +0900)]
Format source codes

7 years agoSet combine_control_expr to false by default and true in rfc-rustfmt
topecongiro [Mon, 5 Jun 2017 06:31:44 +0000 (15:31 +0900)]
Set combine_control_expr to false by default and true in rfc-rustfmt

7 years agoAllow chain item to extend if the parent ends with closing parens and alike
topecongiro [Mon, 5 Jun 2017 06:31:05 +0000 (15:31 +0900)]
Allow chain item to extend if the parent ends with closing parens and alike

7 years agoMerge pull request #1630 from topecongiro/issue-1115
Nick Cameron [Sun, 4 Jun 2017 23:41:52 +0000 (11:41 +1200)]
Merge pull request #1630 from topecongiro/issue-1115

Allow comments after attributes on enum fields

7 years agoMerge pull request #1629 from topecongiro/issue-982
Nick Cameron [Sun, 4 Jun 2017 23:37:21 +0000 (11:37 +1200)]
Merge pull request #1629 from topecongiro/issue-982

Use recover_comment_removed in rewrite_static

7 years agoAllow comments after attributes on enum fields
topecongiro [Sun, 4 Jun 2017 14:27:21 +0000 (23:27 +0900)]
Allow comments after attributes on enum fields

7 years agoFormat source codes
topecongiro [Sun, 4 Jun 2017 06:25:07 +0000 (15:25 +0900)]
Format source codes

7 years agoForbid method chain to get combined if it uses multi line.
topecongiro [Sun, 4 Jun 2017 06:23:00 +0000 (15:23 +0900)]
Forbid method chain to get combined if it uses multi line.

If the method chain goes multi line before the last element, disallow combining
the method chain.

7 years agoAdd macro to block expr
topecongiro [Sun, 4 Jun 2017 06:21:30 +0000 (15:21 +0900)]
Add macro to block expr

7 years agoUpdate tests
topecongiro [Sat, 3 Jun 2017 13:50:55 +0000 (22:50 +0900)]
Update tests

7 years agoFormat source codes
topecongiro [Sat, 3 Jun 2017 13:50:44 +0000 (22:50 +0900)]
Format source codes

7 years agoAdd combine_control_expr option
topecongiro [Sat, 3 Jun 2017 13:50:13 +0000 (22:50 +0900)]
Add combine_control_expr option

7 years agoRefactor rewrite_call
topecongiro [Sat, 3 Jun 2017 13:49:29 +0000 (22:49 +0900)]
Refactor rewrite_call

7 years agoForbid line break between if and pattern
topecongiro [Sat, 3 Jun 2017 13:44:21 +0000 (22:44 +0900)]
Forbid line break between if and pattern

7 years agoAdd `use_block_indent` method to RewriteContext
topecongiro [Sat, 3 Jun 2017 13:43:12 +0000 (22:43 +0900)]
Add `use_block_indent` method to RewriteContext

7 years agoUse recover_comment_removed in rewrite_static
topecongiro [Sun, 4 Jun 2017 09:35:17 +0000 (18:35 +0900)]
Use recover_comment_removed in rewrite_static

7 years agoMerge pull request #1619 from topecongiro/config/format_if_else_cond_comment
Nick Cameron [Sun, 4 Jun 2017 03:26:26 +0000 (15:26 +1200)]
Merge pull request #1619 from topecongiro/config/format_if_else_cond_comment

Add format_if_else_cond_comment config option

7 years agoMerge pull request #1628 from topecongiro/issue-1113
Nick Cameron [Sat, 3 Jun 2017 23:40:37 +0000 (11:40 +1200)]
Merge pull request #1628 from topecongiro/issue-1113

Preserve the layout of comment after return type

7 years agoMerge pull request #1627 from topecongiro/issue-1624
Nick Cameron [Sat, 3 Jun 2017 23:34:25 +0000 (11:34 +1200)]
Merge pull request #1627 from topecongiro/issue-1624

Refactor vertical layout of function definition with options

7 years agoMerge pull request #1626 from topecongiro/issue-1623
Nick Cameron [Sat, 3 Jun 2017 23:32:37 +0000 (11:32 +1200)]
Merge pull request #1626 from topecongiro/issue-1623

Forbid trailing comma at the end of args of variadic functions

7 years agoPreserve the layout of comment after return type
topecongiro [Sat, 3 Jun 2017 21:29:08 +0000 (06:29 +0900)]
Preserve the layout of comment after return type

7 years agoOrganize vertical layout of function definition
Seiichi Uchida [Sat, 3 Jun 2017 14:18:39 +0000 (23:18 +0900)]
Organize vertical layout of function definition

7 years agoUse correct budget
Seiichi Uchida [Sat, 3 Jun 2017 14:17:30 +0000 (23:17 +0900)]
Use correct budget

7 years agoPut opening paren next to multi line generic
Seiichi Uchida [Sat, 3 Jun 2017 14:16:29 +0000 (23:16 +0900)]
Put opening paren next to multi line generic

7 years agoForbid trailing comma at the end of args of variadic functions
Seiichi Uchida [Sat, 3 Jun 2017 06:01:04 +0000 (15:01 +0900)]
Forbid trailing comma at the end of args of variadic functions

7 years agoUnindent comment on top of `else`
topecongiro [Fri, 2 Jun 2017 02:58:19 +0000 (11:58 +0900)]
Unindent comment on top of `else`

7 years agoFix a typo
Seiichi Uchida [Fri, 2 Jun 2017 02:20:49 +0000 (11:20 +0900)]
Fix a typo

7 years agoRename the Style::Default option to Legacy
Nick Cameron [Thu, 1 Jun 2017 23:44:38 +0000 (11:44 +1200)]
Rename the Style::Default option to Legacy

7 years agoMerge pull request #1620 from topecongiro/rfc-if
Nick Cameron [Thu, 1 Jun 2017 23:36:16 +0000 (11:36 +1200)]
Merge pull request #1620 from topecongiro/rfc-if

Use correct line budget when using Rfc control style

7 years agoUse correct one line budget when using Rfc control style
topecongiro [Thu, 1 Jun 2017 10:59:50 +0000 (19:59 +0900)]
Use correct one line budget when using Rfc control style

7 years agoMerge pull request #1616 from topecongiro/nested-closure
Nick Cameron [Thu, 1 Jun 2017 03:42:16 +0000 (15:42 +1200)]
Merge pull request #1616 from topecongiro/nested-closure

Use block indent style when visual indent style fails

7 years agoFormat source codes
Seiichi Uchida [Thu, 1 Jun 2017 03:08:09 +0000 (12:08 +0900)]
Format source codes

7 years agoUse block indent style when visual indent failed
Seiichi Uchida [Thu, 1 Jun 2017 03:07:10 +0000 (12:07 +0900)]
Use block indent style when visual indent failed

7 years agoMerge pull request #1613 from khadiwala/master
Nick Cameron [Wed, 31 May 2017 03:32:04 +0000 (15:32 +1200)]
Merge pull request #1613 from khadiwala/master

Expose methods to locate and load config

7 years agoFix typo in from_toml_path
Ravi Khadiwala [Wed, 31 May 2017 03:24:12 +0000 (22:24 -0500)]
Fix typo in from_toml_path

7 years agoExpose methods to locate and load config
Ravi Khadiwala [Wed, 31 May 2017 00:55:26 +0000 (19:55 -0500)]
Expose methods to locate and load config

* Make method for searching parents for toml file public
* Make method for loading config from path directly public, tweak the
  API since it was never returning None

7 years agoMerge pull request #1609 from topecongiro/nested-tuple
Nick Cameron [Tue, 30 May 2017 23:58:03 +0000 (11:58 +1200)]
Merge pull request #1609 from topecongiro/nested-tuple

Put a space between nested tuple field

7 years agoPut a space between nested tuple field
topecongiro [Tue, 30 May 2017 11:40:05 +0000 (20:40 +0900)]
Put a space between nested tuple field

7 years agoMerge pull request #1608 from topecongiro/issue-1598
Nick Cameron [Tue, 30 May 2017 03:28:44 +0000 (15:28 +1200)]
Merge pull request #1608 from topecongiro/issue-1598

Fix index bug in write_snippet_inner

7 years agoMerge pull request #1607 from topecongiro/many-slashes
Nick Cameron [Tue, 30 May 2017 03:28:11 +0000 (15:28 +1200)]
Merge pull request #1607 from topecongiro/many-slashes

Allow longer custom comments

7 years agoFix index bug in write_snippet_inner
topecongiro [Tue, 30 May 2017 01:53:48 +0000 (10:53 +0900)]
Fix index bug in write_snippet_inner

7 years agoAllow longer custom comment
topecongiro [Mon, 29 May 2017 23:15:12 +0000 (08:15 +0900)]
Allow longer custom comment

7 years agoMerge pull request #1604 from topecongiro/comment-group
Nick Cameron [Mon, 29 May 2017 20:53:22 +0000 (08:53 +1200)]
Merge pull request #1604 from topecongiro/comment-group

Format comments with different opening in different manner

7 years agoUse different style when rewriting comment with different opener
topecongiro [Sun, 28 May 2017 10:10:05 +0000 (19:10 +0900)]
Use different style when rewriting comment with different opener

7 years agoMerge pull request #1602 from topecongiro/attributes-on-expressions
Nick Cameron [Sun, 28 May 2017 06:34:50 +0000 (18:34 +1200)]
Merge pull request #1602 from topecongiro/attributes-on-expressions

Allow attributes on expressions

7 years agoMerge pull request #1601 from topecongiro/issue-1600
Nick Cameron [Sun, 28 May 2017 06:32:15 +0000 (18:32 +1200)]
Merge pull request #1601 from topecongiro/issue-1600

Allow attributes in generics of impl

7 years agoMerge pull request #1599 from topecongiro/performance/binary-search
Nick Cameron [Sun, 28 May 2017 06:30:58 +0000 (18:30 +1200)]
Merge pull request #1599 from topecongiro/performance/binary-search

Avoid unnecessary binary search in rewrite_call

7 years agoAdd tests for issues which can be closed on the current master
topecongiro [Sun, 7 May 2017 21:44:48 +0000 (06:44 +0900)]
Add tests for issues which can be closed on the current master

This PR adds tests for #325, #1092,  #1214, #1278, #1329 and #1427.

7 years agoAllow attributes on expressions
topecongiro [Sun, 28 May 2017 02:41:16 +0000 (11:41 +0900)]
Allow attributes on expressions

7 years agoAllow attributes in generics of impl
Seiichi Uchida [Sat, 27 May 2017 14:59:29 +0000 (23:59 +0900)]
Allow attributes in generics of impl

7 years agoAvoid unnecessary binary search in rewrite_call
Seiichi Uchida [Sat, 27 May 2017 09:48:42 +0000 (18:48 +0900)]
Avoid unnecessary binary search in rewrite_call

7 years agoMerge pull request #1597 from topecongiro/comments-after-attributes
Nick Cameron [Sat, 27 May 2017 01:47:42 +0000 (13:47 +1200)]
Merge pull request #1597 from topecongiro/comments-after-attributes

Allow comments after attributes of struct fields

7 years agoMerge pull request #1596 from topecongiro/issue-1595
Nick Cameron [Sat, 27 May 2017 01:38:14 +0000 (13:38 +1200)]
Merge pull request #1596 from topecongiro/issue-1595

Add a trailing comma if the last arg ends with comment

7 years agoMerge pull request #1593 from topecongiro/issue-1439
Nick Cameron [Sat, 27 May 2017 01:34:50 +0000 (13:34 +1200)]
Merge pull request #1593 from topecongiro/issue-1439

Allow comments after where clause

7 years agoMerge pull request #1588 from topecongiro/nesting-macro
Nick Cameron [Sat, 27 May 2017 01:28:47 +0000 (13:28 +1200)]
Merge pull request #1588 from topecongiro/nesting-macro

Allow macro to be nested like function call

7 years agoMerge pull request #1591 from topecongiro/associated-type-defaults
Nick Cameron [Sat, 27 May 2017 01:14:16 +0000 (13:14 +1200)]
Merge pull request #1591 from topecongiro/associated-type-defaults

Allow default associated types

7 years agoAllow comments after attributes of struct fields
topecongiro [Sat, 27 May 2017 00:36:25 +0000 (09:36 +0900)]
Allow comments after attributes of struct fields

7 years agoAdd a trailing comma if the last arg ends with comment
topecongiro [Fri, 26 May 2017 22:33:06 +0000 (07:33 +0900)]
Add a trailing comma if the last arg ends with comment

7 years agoAllow comments after where clause
topecongiro [Fri, 26 May 2017 17:03:22 +0000 (02:03 +0900)]
Allow comments after where clause

7 years agoAllow default associated types
topecongiro [Fri, 26 May 2017 08:17:12 +0000 (17:17 +0900)]
Allow default associated types

7 years agoFormat source codes and add tests
topecongiro [Fri, 26 May 2017 07:36:15 +0000 (16:36 +0900)]
Format source codes and add tests

7 years agoAllow macro to nested and overflowed like function call
topecongiro [Fri, 26 May 2017 07:35:34 +0000 (16:35 +0900)]
Allow macro to nested and overflowed like function call

7 years agoSet inside_macro to false when rewriting args of macro
topecongiro [Fri, 26 May 2017 07:34:58 +0000 (16:34 +0900)]
Set inside_macro to false when rewriting args of macro

7 years agoMerge pull request #1589 from topecongiro/issue-1587
Nick Cameron [Fri, 26 May 2017 05:40:23 +0000 (17:40 +1200)]
Merge pull request #1589 from topecongiro/issue-1587

Put closing paren on the next line when the last arg contains comment

7 years agoPut closing paren on the next line when the last arg contains comment
topecongiro [Fri, 26 May 2017 04:14:36 +0000 (13:14 +0900)]
Put closing paren on the next line when the last arg contains comment

7 years agoMerge pull request #1586 from topecongiro/minor
Nick Cameron [Thu, 25 May 2017 20:43:52 +0000 (08:43 +1200)]
Merge pull request #1586 from topecongiro/minor

Fix minor bugs

7 years agoMerge pull request #1584 from topecongiro/poor/chain-trailing-try
Nick Cameron [Thu, 25 May 2017 20:35:25 +0000 (08:35 +1200)]
Merge pull request #1584 from topecongiro/poor/chain-trailing-try

Enhance chain

7 years agoAdd offset when rewriting index
Seiichi Uchida [Thu, 25 May 2017 14:01:41 +0000 (23:01 +0900)]
Add offset when rewriting index

7 years agoUpdate tests
Seiichi Uchida [Thu, 25 May 2017 13:55:33 +0000 (22:55 +0900)]
Update tests

7 years agoBe precise with one_line_budget for fn_base
Seiichi Uchida [Thu, 25 May 2017 13:55:11 +0000 (22:55 +0900)]
Be precise with one_line_budget for fn_base

7 years agoAdd a test for #1380
topecongiro [Thu, 25 May 2017 07:30:45 +0000 (16:30 +0900)]
Add a test for #1380

7 years agoFormat source codes
topecongiro [Thu, 25 May 2017 07:08:08 +0000 (16:08 +0900)]
Format source codes

7 years agoAdd chain_split_single_child option
topecongiro [Thu, 25 May 2017 07:07:56 +0000 (16:07 +0900)]
Add chain_split_single_child option

7 years agoAllow the last elem in chain to overflow
topecongiro [Thu, 25 May 2017 06:47:50 +0000 (15:47 +0900)]
Allow the last elem in chain to overflow

7 years agoRefactoring: introduce one_line_budget
topecongiro [Thu, 25 May 2017 04:35:09 +0000 (13:35 +0900)]
Refactoring: introduce one_line_budget

7 years agoFormat source codes
topecongiro [Thu, 25 May 2017 00:34:10 +0000 (09:34 +0900)]
Format source codes

7 years agoDisallow single line chain when the line exceeds the given budget
topecongiro [Thu, 25 May 2017 00:32:14 +0000 (09:32 +0900)]
Disallow single line chain when the line exceeds the given budget

7 years agoConsider trailing try operations when counting almost_total
topecongiro [Thu, 25 May 2017 00:24:04 +0000 (09:24 +0900)]
Consider trailing try operations when counting almost_total

7 years agoSimplify --version info
Nick Cameron [Thu, 25 May 2017 04:39:44 +0000 (16:39 +1200)]
Simplify --version info

7 years agoRemove dependency on Itertools
Nick Cameron [Thu, 25 May 2017 04:23:07 +0000 (16:23 +1200)]
Remove dependency on Itertools

7 years agoRemove multimap dep
Nick Cameron [Thu, 25 May 2017 03:59:06 +0000 (15:59 +1200)]
Remove multimap dep

7 years agoMerge pull request #1582 from topecongiro/poor/fn_call_style_block
Nick Cameron [Wed, 24 May 2017 22:50:17 +0000 (10:50 +1200)]
Merge pull request #1582 from topecongiro/poor/fn_call_style_block

Decide whether args fit in a single line inside rewrite_call_args

7 years agoDecide whether args fit in a single line inside rewrite_call_args
topecongiro [Wed, 24 May 2017 21:10:00 +0000 (06:10 +0900)]
Decide whether args fit in a single line inside rewrite_call_args

7 years agoMerge pull request #1578 from topecongiro/poor/macro
Nick Cameron [Tue, 23 May 2017 23:43:10 +0000 (11:43 +1200)]
Merge pull request #1578 from topecongiro/poor/macro

Use original code snippet for macro which contains invalid syntax

7 years agoReturn original snippet when macro contains invalid syntax
topecongiro [Tue, 23 May 2017 16:18:15 +0000 (01:18 +0900)]
Return original snippet when macro contains invalid syntax

7 years agoMerge pull request #1576 from topecongiro/chain/float-first-child
Nick Cameron [Tue, 23 May 2017 20:47:10 +0000 (08:47 +1200)]
Merge pull request #1576 from topecongiro/chain/float-first-child

 Allow first child to stay on the same line with block parent when rewriting chain

7 years agoFormat source codes
topecongiro [Tue, 23 May 2017 15:07:02 +0000 (00:07 +0900)]
Format source codes

7 years agoAdd heuristic when rewriting chain with a single child
topecongiro [Tue, 23 May 2017 15:06:23 +0000 (00:06 +0900)]
Add heuristic when rewriting chain with a single child

rustfmt splits chain into multiline when the length of chain exceeds
`chain_one_line_max`. However, currenly this rule only applies when the chain
has more than one child. This can lead to unexpected long chain if the parent
is long. This commit adds heuristic that if the length of parent is longer
than the half of `chain_one_line_max` we use multiline even if there is
only a single child.

7 years agoFormat source codes
topecongiro [Tue, 23 May 2017 13:13:29 +0000 (22:13 +0900)]
Format source codes

7 years agoUse correct width when rewriting chain
topecongiro [Tue, 23 May 2017 13:12:52 +0000 (22:12 +0900)]
Use correct width when rewriting chain

7 years agoAllow first child to stay on the same line with block parent
topecongiro [Tue, 23 May 2017 13:12:37 +0000 (22:12 +0900)]
Allow first child to stay on the same line with block parent

7 years agoMerge pull request #1572 from topecongiro/nested-block
Nick Cameron [Tue, 23 May 2017 06:35:21 +0000 (18:35 +1200)]
Merge pull request #1572 from topecongiro/nested-block

Nesting of block indented expressions