Commit Graph

2557 Commits

Author SHA1 Message Date
topecongiro
e636fe732e Use Span from ast::WhereClause 2017-08-01 18:36:36 +09:00
Nick Cameron
c283d3e643 Merge pull request #1840 from topecongiro/match-with-max-width
Match with max width
2017-08-01 13:51:23 +12:00
Nick Cameron
0e846998e6 Merge pull request #1842 from emilio/rustfmt-format-diff
bin: Add a very simple rustfmt-format-diff.
2017-08-01 13:42:10 +12:00
Nick Cameron
b9e5afd62e Merge pull request #1841 from emilio/file-lines-fixes
visitor: A few file lines fixes
2017-08-01 13:41:04 +12:00
Emilio Cobos Álvarez
068bcad880
rustfmt-format-diff: Use logging macros instead of "-v" option. 2017-07-31 09:38:24 +01:00
Emilio Cobos Álvarez
c12b4e9031
bin: Add a very simple rustfmt-format-diff.
This patch introduces a super-simple format-diff tool, that allows you to do:

```
git diff | rustfmt-format-diff -p 1
```

To format your current changes.

For now it doesn't accept too much customisation, and it basically calls rustfmt
with the default configuration, but more customisation can be added in the
future if needed.
2017-07-31 09:15:35 +01:00
Emilio Cobos Álvarez
27a3bdb394
visitor: Only reorder imports if at least one of them is in file-lines. 2017-07-31 09:14:58 +01:00
Emilio Cobos Álvarez
6bf9124ace
visitor: Make sure to don't eat or realign items when they should be skipped due to file-lines.
Before this patch, stuff like the argument with the comment was realigned to
column 0, even when being outside of the file_lines range.
2017-07-31 09:14:58 +01:00
Seiichi Uchida
36b347b123 Update tests 2017-07-31 16:24:18 +09:00
Seiichi Uchida
568a9adf87 Avoid early line breaks in match condition 2017-07-31 16:24:07 +09:00
Seiichi Uchida
e588f2fd7b Make definitive_tactic more generic via enum Separator 2017-07-31 16:23:42 +09:00
Seiichi Uchida
47456aaa43 Merge pull request #1819 from brainlessdeveloper/fix-extern-crate-whitespace
Remove whitespace between words in extern declarations
2017-07-31 16:21:48 +09:00
Nick Cameron
7c9db55c8a Merge pull request #1836 from topecongiro/issue-1835
More fine-grained file-lines
2017-07-31 09:21:32 +12:00
Seiichi Uchida
570a3505b9 Make definitive_tactic more generic with separator length 2017-07-29 22:13:23 +09:00
Fausto Núñez Alberro
3377ba4dd7 Remove whitespace between extern crate declaration 2017-07-29 12:03:57 +02:00
topecongiro
5aff5beb2a More fine-grained file-lines 2017-07-29 16:11:36 +09:00
Nick Cameron
74f5a515ef Merge pull request #1831 from topecongiro/trait-associated-type-with-default
Fix a typo in rewrite_associated_type
2017-07-29 12:31:36 +12:00
Nick Cameron
19bd5ea7b3 Merge pull request #1826 from topecongiro/issue-1824
Use correct BytePos for where when rewriting trait
2017-07-29 12:11:17 +12:00
topecongiro
462530cb7e Fix a typo in rewrite_associated_type 2017-07-28 06:27:34 +09:00
topecongiro
5a81c7d4b0 Use correct BytePos for where when rewriting trait 2017-07-27 14:21:14 +09:00
Nick Cameron
f0cc060b41 Merge pull request #1827 from topecongiro/default-keyword
Format defaultness
2017-07-27 14:27:06 +12:00
topecongiro
c3cc8fcb13 Format defaultness 2017-07-27 09:43:35 +09:00
Nick Cameron
1f991d00e0 Merge pull request #1822 from topecongiro/issue-1172
Remove newlines between list elements for expressions
2017-07-27 11:15:53 +12:00
Nick Cameron
bca0dd9a76 Merge pull request #1821 from topecongiro/avoid-unnecessary-line-breaks
Avoid unnecessary line breaks
2017-07-27 11:07:17 +12:00
Seiichi Uchida
7c9aee78f0 Update tests 2017-07-26 22:43:50 +09:00
Seiichi Uchida
261865ecc9 Remove newlines between list elements for expressions 2017-07-26 22:43:36 +09:00
topecongiro
38614e7af1 Format source codes and update tests 2017-07-26 17:43:17 +09:00
topecongiro
6b8f62fcc8 Avoid regression 2017-07-26 17:42:52 +09:00
topecongiro
760d6b85e2 Ignore the last line overhead when rewriting condition 2017-07-26 17:41:45 +09:00
topecongiro
2ffe4d0563 Simplify rewrite_pair 2017-07-26 17:40:57 +09:00
topecongiro
e523f053a3 Format source codes and update tests 2017-07-26 16:30:58 +09:00
topecongiro
3884b532b9 Avoid unnecessary line breaks in condition expression 2017-07-26 16:28:55 +09:00
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
Nick Cameron
7634bd3be0 Merge pull request #1816 from topecongiro/struct-variant-width-0
Force vertical layout when struct_variant_width is 0
2017-07-26 11:32:42 +12:00
topecongiro
d97ecd319d Update tests 2017-07-25 18:51:29 +09:00
topecongiro
65ad7d3bb0 Put braces on the next line if it exceeds max width 2017-07-25 18:51:14 +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
Nick Cameron
cb351440e9 cargo update 2017-07-25 15:57:56 +12:00
Nick Cameron
9f572dbc64 Merge pull request #1805 from topecongiro/inner-attr
Format inner attributes
2017-07-25 11:38:59 +12:00
Seiichi Uchida
5c99d6c6bc Update tests 2017-07-25 00:56:09 +09:00
Seiichi Uchida
8b970fcc9f Format inner attributes wherever possible 2017-07-25 00:55:55 +09:00
Seiichi Uchida
adce954560 Support inner attributes 2017-07-25 00:55:29 +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
Nick Cameron
83b0feca0b Merge pull request #1811 from topecongiro/rustfmt-skip-on-stmt
Support rustfmt_skip on statements
2017-07-22 16:07:25 +12:00
topecongiro
d7a57d36e7 Update tests 2017-07-22 11:18:59 +09:00
topecongiro
0b38ac40d7 Support rustfmt_skip on statements 2017-07-22 11:18:47 +09:00
topecongiro
68c6fe70fd Format source codes and update tests 2017-07-21 17:57:31 +09:00
topecongiro
a16307a70f Allow block-like rhs expression to stay on the same line as lhs 2017-07-21 17:57:31 +09:00