Commit graph

1417 commits

Author SHA1 Message Date
crw5996
3585706fa2 Merge branch 'master' of https://github.com/rust-lang-nursery/rustfmt into fix-optional-arg-condensing 2018-08-27 13:44:56 -04:00
Seiichi Uchida
e1069403ca Add a test for #2969 2018-08-27 16:12:11 +09:00
Nick Cameron
97d29ff2e1
Merge pull request #2942 from crw5996/fix-ellipsis-bug
Fix Issue with ellipsis matching in pattern.rs
2018-08-27 09:44:28 +12:00
Seiichi Uchida
e5a41e5682 Add a test for #2953 2018-08-26 13:19:44 +09:00
Zach Lute
ca19c9a35a Fix build with rust nightly by updating try block syntax. (#2965) 2018-08-26 13:02:24 +09:00
Maximilian Roos
10512a59d0 Impl only use (#2951) 2018-08-24 14:39:05 +09:00
chris
4e748a269e Fixed ellipsis bug where rustfmt was creating code that could not be parsed 2018-08-24 00:58:21 -04:00
cad97
04d804c365 Rename CodeMap/FileMap to SourceMap/SourceFile
#2946
2018-08-23 17:10:46 -04:00
Nick Cameron
8573df602a
Merge pull request #2925 from scampi/issue539
discard trailing blank comments
2018-08-23 10:13:56 +12:00
Seiichi Uchida
dfe4eef8fc Remove an invalid attribute from a test
This has become a parser error.
2018-08-19 00:26:56 +09:00
Stéphane Campinas
dd14d304ef
discard trailing blank comments 2018-08-16 19:59:32 +02:00
Stéphane Campinas
f23e6aaaf9
fix the identification of a block comment.
Block comments like below were not properly supported:

    /*
       something here but it doesn't start with a star
     */

because of the line that didn't start with a star.
2018-08-16 19:55:15 +02:00
Seiichi Uchida
71dc033fca Add a test for #2919 2018-08-16 07:49:50 +09:00
Seiichi Uchida
996dbbf960 Add a test for slice patterns 2018-08-12 23:55:34 +09:00
Nick Cameron
66d3924aa8
Merge pull request #2899 from topecongiro/chain-with-comments
Format chains with comment
2018-08-07 15:07:23 +12:00
Nick Cameron
803d000ed3
Merge pull request #2900 from topecongiro/combine-attrs
Combine function-like attributes
2018-08-06 19:37:05 +12:00
Nick Cameron
e4d560b914
Merge pull request #2897 from topecongiro/issue-2896
Ignore comment in wrap_str
2018-08-06 19:36:03 +12:00
Seiichi Uchida
19ebfd122c Update test 2018-08-06 08:10:04 +09:00
Seiichi Uchida
7bccc4473c Add a test for chains with comment 2018-08-05 21:04:06 +09:00
Seiichi Uchida
c19569c5d3 Add a test for #2896 2018-08-05 10:50:24 +09:00
Seiichi Uchida
cf13534150 Add a test for #2884 2018-08-04 09:59:19 +09:00
Seiichi Uchida
8069efbe10 Add a test for #2888 2018-08-03 20:06:29 +09:00
Nick Cameron
9c34986bab Add some tests I forgot about earlier 2018-08-01 10:41:16 +12:00
Nick Cameron
3c20d8a9e6
Merge pull request #2874 from cavedweller/master
Format Async block and async fn
2018-07-31 08:52:07 +12:00
Benjamin Brittain
46b241004d fix nits 2018-07-29 17:20:21 -07:00
Ben Brittain
fedde3790c Add tests for async & async move 2018-07-29 08:55:36 -07:00
Andrew Audibert
f121b1a3a9 Support raw identifiers in struct expressions 2018-07-28 19:40:52 -07:00
Nick Cameron
69ad879d52
Merge pull request #2864 from topecongiro/issue-2863
Modify the rule for reordering impl items
2018-07-27 16:24:46 +12:00
Nick Cameron
814f6339b4
Merge pull request #2862 from topecongiro/issue-2852
Preserve parens in trait bounds
2018-07-27 16:24:11 +12:00
Seiichi Uchida
87c4bd5a94 Add a test for #2863 2018-07-26 21:35:48 +09:00
Seiichi Uchida
b7c443e948 Add and update tests for trait with paren 2018-07-25 18:27:02 +09:00
Nick Cameron
8ff2836eaf
Merge pull request #2861 from topecongiro/issue-2859
Put lifetimes after trait when they gets orphaned
2018-07-25 21:22:25 +12:00
Seiichi Uchida
1b69ed9ae4 Rename test files 2018-07-25 18:16:10 +09:00
Seiichi Uchida
6b8c6f5e0f Add a test for #2859 2018-07-25 08:33:41 +09:00
Seiichi Uchida
d512240206 Add tests for #2830 and #2857 2018-07-25 07:13:51 +09:00
Seiichi Uchida
a2b40bd70f Add a test for associated existential type 2018-07-25 00:42:19 +09:00
Seiichi Uchida
6eb0bf2bb9 Add a simple test for exitential type 2018-07-25 00:29:45 +09:00
Nick Cameron
dcf9f61635 Add tests
Closes #2773
Closes #2786
2018-07-24 15:46:39 +12:00
Nick Cameron
4fa2969c39 fixup tests 2018-07-24 15:46:39 +12:00
Nick Cameron
6899471497 Check for comments after the => in a match arm
Closes #2188
2018-07-20 16:05:18 +12:00
Nick Cameron
90c5792565 Set rustfmt-format_macro_matchers to false by default
cc #2543
2018-07-18 12:09:50 +12:00
Michael Bebenita
c2ae39e77a Add max_width option for all heuristics.
This is useful when working with very small max_widths like 79 chars.
2018-07-17 13:17:36 -04:00
Nick Cameron
b28a0cd6e6 Fix an anomaly with comments and array literals
Closes #2842
2018-07-17 15:40:19 +12:00
Stéphane Campinas
472a2ed0f6
fix rewrite_string when a line feed is present in a sequence of whitespaces, resulting in strange formatting 2018-07-14 19:22:31 +02:00
Nick Cameron
229a55248b address reviewer comments 2018-07-12 22:21:07 +12:00
Nick Cameron
7a76e5b1b4 Add test for #2802 2018-07-12 21:37:28 +12:00
Nick Cameron
486f8fd8e7 Fixup formatting of tests and source 2018-07-12 21:37:28 +12:00
Seiichi Uchida
25f83b14c7 Add a test for async closures 2018-07-09 23:20:30 +09:00
Nick Cameron
d5cb93216b
Merge pull request #2822 from topecongiro/issue-2782
Avoid panicking on deeply nested expressions
2018-07-01 14:38:30 +12:00
topecongiro
a0206f53d2 Add a test for #2782 2018-07-01 10:40:47 +09:00
topecongiro
669a8bcf82 Add a test for #2721 2018-07-01 09:59:45 +09:00
Nick Cameron
888abbb0ec
Merge pull request #2820 from scampi/defaults
[wip] remove some defaults
2018-07-01 10:57:31 +12:00
Stéphane Campinas
0385c2e6bc
reverted some defaults for tests that are fixing a specific issue 2018-06-30 17:04:50 +02:00
topecongiro
008aa88d6e Add tests for #2818 2018-06-30 19:20:47 +09:00
Stéphane Campinas
f8f9457e20
unecessary use of rustfmt-normalize_comments comment 2018-06-27 15:28:33 +02:00
Stéphane Campinas
a420ac2e3c
formatting 2018-06-27 15:28:32 +02:00
Stéphane Campinas
ad27384cc2
removed comment with default: rustfmt-remove_nested_parens 2018-06-27 15:28:32 +02:00
Stéphane Campinas
0a2aa6526e
removed comment with default: rustfmt-reorder_modules 2018-06-27 15:28:32 +02:00
Stéphane Campinas
95d71899f7
removed comment with default: rustfmt-imports_indent 2018-06-27 15:28:32 +02:00
Stéphane Campinas
872ed58ffc
removed comment with default: rustfmt-reorder_imports 2018-06-27 15:28:32 +02:00
Stéphane Campinas
0ee452bd2a
removed comment with default: rustfmt-format_strings 2018-06-27 01:36:02 +02:00
Stéphane Campinas
92aecc37fe
removed comment with default: rustfmt-control_brace_style 2018-06-27 01:36:02 +02:00
Stéphane Campinas
4c65bd1c46
removed comment with default: rustfmt-brace_style 2018-06-27 01:36:02 +02:00
Stéphane Campinas
fe0ac6742e
removed comment with default: rustfmt-max_width 2018-06-27 01:36:01 +02:00
Stéphane Campinas
87f72d4333
removed comment with default: rustfmt-error_on_line_overflow 2018-06-27 01:36:01 +02:00
Stéphane Campinas
5ad7325ada
removed comment with default: rustfmt-normalize_comments 2018-06-27 01:35:57 +02:00
Stéphane Campinas
a4d1469baf
removed comment with default: rustfmt-indent_style 2018-06-27 01:35:53 +02:00
Nick Cameron
3abebf95ce Apply short function call heuristic to attributes
Closes #2620
2018-06-26 15:18:17 +12:00
Nick Cameron
42f03458dd Refactor and fixup attribute formatting
Preserves trailing commas (except in derives where we follow function args).
Correctly uses `#` vs `#!` for derives.
Uses block indent for derives, fixes #2805.
2018-06-26 15:18:17 +12:00
Nick Cameron
be4d37da4b Indent a match guard if the pattern is multiline
Closes #2377
2018-06-26 15:18:17 +12:00
Seiichi Uchida
eb168f608a Add more tests 2018-06-25 23:41:44 +09:00
Seiichi Uchida
3871988dfa Add a test for raw identifiers 2018-06-25 23:36:37 +09:00
Nick Cameron
ca1c13a896
Merge pull request #2804 from Mike-Baker/mb-strip-vert-in-match-arms
Strip leading `|` in match arm patterns
2018-06-25 21:02:24 +12:00
topecongiro
fa1978882b Add a test for #2791
Closes #2791.
2018-06-25 15:27:09 +09:00
Mike Baker
1d4b988414 Strip leading | in match arm patterns
This addresses issue #2621

This commit turns out to be a partial revert of
ea3c01e337

The rationale is that a `|` character preceding a match pattern is not
semantically relevant and therefore should be considered a
style/formatting choice.

A discussion concluded that the best way to emit consistent formatting
here was to strip the leading `|`

This removes the match_with_beginning_vert test because it was asserting
the old behaviour which has been changed, it adds a new test
(issue_2621) which should be a more comprehensive check of the behavior
of `|` in match arms.

Discussion at https://github.com/rust-lang-nursery/fmt-rfcs/issues/119
2018-06-25 00:53:15 +01:00
Nick Cameron
1ead31ae9d
Merge pull request #2795 from jechase/issue-2794
Add test and fix for #2794
2018-06-20 10:35:16 +12:00
Nick Cameron
fb5513564e
Merge pull request #2785 from wada314/issue-2728
Fix #2728.
2018-06-20 10:32:46 +12:00
Josh Chase
ea540651b7 Switch to comments for rustfmt config 2018-06-19 09:30:50 -04:00
Shohei Wada
036244cdce Fix #2728. 2018-06-19 20:51:49 +09:00
Nick Cameron
261238ea51 Change use_small_heuristics to an enum and stabilise
Since it is now an enum, we can be future compatible since we can add variants
for different heuristics.

Closes #1974
2018-06-19 13:28:27 +12:00
Josh Chase
4565d41790 Add test for #2794 2018-06-18 12:51:19 -04:00
Seiichi Uchida
23ca2b670e Add a test for #2630
Closes #2630.
2018-06-13 20:39:47 +09:00
Nick Cameron
34067a1c4c
Merge pull request #2775 from topecongiro/macro-def-with-complex-macro
Change format_snippet to return None when it has failed to format macro call
2018-06-08 08:50:35 +12:00
Seiichi Uchida
19054347ca Fix test failures 2018-06-07 15:20:01 +09:00
Seiichi Uchida
5e59e686c1 Add tests for #2607 and #2770 2018-06-07 12:30:14 +09:00
csmoe
c791a54ff4 repair break_label format 2018-06-07 11:21:52 +08:00
csmoe
5cd76a3de5 update test 2018-06-07 11:15:42 +08:00
Nick Cameron
da30d235a4
Merge pull request #2771 from topecongiro/issue-2746
Fix poor formatting of impls
2018-06-06 14:38:42 +12:00
Nick Cameron
576e9af0ae
Merge pull request #2769 from topecongiro/issue-2765
Put each nested import on its own line
2018-06-06 14:37:25 +12:00
Seiichi Uchida
d96d853b5c Fix up tests for empty impls 2018-06-06 10:56:07 +09:00
Seiichi Uchida
356a0c4b58 Add a test for #2746 2018-06-06 10:55:56 +09:00
Seiichi Uchida
35fee77d39 Add a test for #2765 2018-06-05 19:58:28 +09:00
Seiichi Uchida
0204dcbd98 Update tests 2018-06-05 19:58:21 +09:00
Seiichi Uchida
e4125ff96a Add a test for #2759 2018-06-05 15:56:51 +09:00
Nick Cameron
d9149fb52e
Merge pull request #2741 from csmoe/where_brace
Remove newline in empty impl
2018-06-05 18:04:22 +12:00
Seiichi Uchida
b9631d1209 Add a test for #2761 2018-06-05 13:42:58 +09:00
csmoe
8874c95a00 recover suppressed comma 2018-06-04 19:10:09 +08:00
csmoe
d46852b3f7 fix tests 2018-05-31 18:34:06 +08:00
Seiichi Uchida
11835ce5ce Add tests for #2749 2018-05-30 08:44:57 +09:00
Nick Cameron
1d5da1011f
Merge pull request #2733 from topecongiro/issue-2727
Trim unnecessary whitespaces between a macro call and a semicolon
2018-05-28 10:12:23 +12:00