Commit Graph

1936 Commits

Author SHA1 Message Date
topecongiro beeaf8d065 Fix a typo 2017-08-09 16:37:21 +09:00
topecongiro bb8afcb091 Avoid rewriting the last argument whenever possible 2017-08-09 16:37:21 +09:00
topecongiro be38606c77 Add leave_last field to ListItems 2017-08-09 16:37:21 +09:00
Seiichi Uchida f9239dd630 Format source codes and update tests 2017-08-09 16:36:41 +09:00
Seiichi Uchida 04a6d16c7b Avoid trial and error in rewrite_chain whenever possible 2017-08-09 16:36:41 +09:00
Seiichi Uchida 7268a50e36 Handle prefix and suffix try operators differently 2017-08-09 16:36:41 +09:00
Nick Cameron 2c293bd01b Merge pull request #1863 from topecongiro/issue-1862
Keep the pre-comment on the same line with item if it fits max width
2017-08-09 19:16:42 +12:00
topecongiro 021f922b9c Keep the pre-comment on the same line with item if it fits max width 2017-08-08 18:24:06 +09:00
Nick Cameron b1b2dc8e0a Merge pull request #1859 from porglezomp-misc/master
Fix #1858 - "Don't erase a use with attributes attached"
2017-08-07 15:43:14 +12:00
Caleb Jones 94df4f8cca Move the empty path_list handling into rewrite_use_list() 2017-08-06 23:04:33 -04:00
Caleb Jones fa242a5cd6 Fix #1858 - "Don't erase a use with attributes attached"
This prevents code like

    #[cfg(unix)]
    pub use self::unix::{};

from becoming

    #[cfg(unix)]

which would cause the attribute to be attached to the next item.
2017-08-06 19:53:57 -04:00
Nick Cameron fc95e2827b Merge pull request #1855 from topecongiro/inner-outer-attrs
Format inner attributes in match expr
2017-08-06 11:24:38 +12:00
topecongiro 6f24c64673 Update tests 2017-08-05 15:24:20 +09:00
topecongiro 6b85c4a6e7 Format inner attributes in match expr 2017-08-05 15:24:12 +09:00
topecongiro d4bf413956 Do not add missing snippet between arms if it's just spaces 2017-08-05 15:23:23 +09:00
topecongiro 60fb11e5dd Do not take inner attributes into account for span 2017-08-05 15:21:46 +09:00
Nick Cameron 41df87ec44 Merge pull request #1848 from topecongiro/refactor-rewrite-where-clause
Refactor `rewrite_where_clause()`
2017-08-03 11:28:16 +12:00
Seiichi Uchida 697e9485f7 Update tests 2017-08-02 23:28:52 +09:00
Seiichi Uchida a5a7cc7643 Insert newline between type alias with where clause 2017-08-02 23:27:33 +09:00
Seiichi Uchida c0c27761b4 Simplify comments separator 2017-08-02 23:27:19 +09:00
Seiichi Uchida d955497751 Factor out boolean flags for rewrite_where_clause() 2017-08-02 23:26:35 +09:00
Nick Cameron 9ae00a4498 Merge pull request #1847 from topecongiro/issue-1843
Implement single-line where
2017-08-02 14:28:48 +12:00
Nick Cameron 39745b9540 Merge pull request #1846 from topecongiro/where-clause-span
Use Span from ast::WhereClause
2017-08-02 14:23:58 +12:00
Seiichi Uchida d2acd99703 Update tests 2017-08-01 22:27:12 +09:00
Seiichi Uchida 659d325982 Implement compressed where clause with Rfc style 2017-08-01 22:27:12 +09:00
Seiichi Uchida ec6c2d6e99 Refactor compute_budgets_for_args() 2017-08-01 22:27:12 +09:00
Seiichi Uchida c67f729205 Refactoring 2017-08-01 22:27:12 +09:00
Seiichi Uchida 6ab727e6ff Set where_density default value to Density::Vertical 2017-08-01 22:27:12 +09:00
Seiichi Uchida 14f416273b Add format_constness() and last_line_used_width() 2017-08-01 22:27:12 +09:00
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