Seiichi Uchida
a43ac40a78
Add tests for #2588
2018-04-05 12:52:43 +09:00
Seiichi Uchida
94f5a05a6a
Add reorder_impl_items config option
2018-04-05 12:49:16 +09:00
Ryan Leung
2c7e737a06
add tests for macro!(/* comment */) ( #2592 )
...
* add tests
2018-04-04 11:02:01 +09:00
Shotaro Yamada
e2d801f11e
Do not turn spaces in the beginning of the file into a newline ( #2583 )
2018-04-01 23:09:53 +09:00
Ivan Sorokin
e6423cf4b1
Add test #2574 ( #2577 )
2018-04-01 00:54:44 +09:00
Seiichi Uchida
13964b739e
Update tests
...
1. snake_case < CamelCase < UPPER_SNAKE_CASE
2. Use vertical layout for list with nested imports.
2018-03-31 13:16:36 +09:00
Seiichi Uchida
3de184fb0e
Merge pull request #2572 from codeworm96/remove_unreachable
...
Remove unreachable! from macros.rs
2018-03-29 09:16:38 +09:00
codeworm96
38107192f1
Add test for #2558
...
When run against invalid macro definitions, rustfmt should leave
them unchanged rather than panic.
2018-03-28 23:50:21 +08:00
Nick Cameron
72b715bad4
Merge pull request #2571 from topecongiro/issue-2569
...
Avoid panicking on macro call with a single comma
2018-03-28 17:02:49 +02:00
Nick Cameron
1644b174a7
Merge pull request #2557 from topecongiro/vertical-layout-complex-attrs
...
Use vertical layout for complex attributes
2018-03-28 17:01:16 +02:00
Seiichi Uchida
a49e00b4d7
Avoid panicking on macro call with a single comma
...
`parse_item` from libsyntax may return `None`, so we need to discard
the result in that case.
2018-03-28 18:14:51 +09:00
rleungx
bf3bf8c235
allow underscore
2018-03-28 00:31:44 +08:00
topecongiro
c77708ff9a
Use vertical layout for complex attributes
2018-03-25 15:17:41 +09:00
Nick Cameron
0bc0241d2a
Merge pull request #2548 from topecongiro/match-mod
...
Do not collapse block around expr with condition on match arm
2018-03-22 15:40:36 +13:00
Seiichi Uchida
5b9b7d5b9f
Do not collapse block around expr with condition on match arm
...
Closes #2376 .
2018-03-21 22:21:08 +09:00
Nick Cameron
fa75ef4663
fixup tests
2018-03-20 09:27:31 +13:00
Seiichi Uchida
adc257f4b3
Put a space before colon that appears after a meta variable
...
Closes #2534 .
2018-03-19 08:27:53 +09:00
Seiichi Uchida
f8109f8e9c
Put spaces around braces
2018-03-19 08:23:53 +09:00
Seiichi Uchida
0fd174d5f1
Handle binary operators and lifetimes
2018-03-19 08:23:53 +09:00
Seiichi Uchida
3f7b59ca2b
Break before meta variables when using multiple lines
2018-03-19 08:23:53 +09:00
Seiichi Uchida
c9701d8e18
Update tests
2018-03-19 08:23:53 +09:00
Seiichi Uchida
9cc038897e
Add a test for #2538
2018-03-17 14:58:56 +09:00
Nick Cameron
c416246494
Merge pull request #2509 from topecongiro/issue-2493
...
Overflow the last rhs of a binary expression
2018-03-16 07:30:30 +13:00
Seiichi Uchida
ccd134ed75
Add a test for #2497
...
Closes #2497 .
2018-03-12 07:54:12 +09:00
Seiichi Uchida
f1d29ff580
Update tests for braces on trait
...
Test that the opening brace of trait with long name or bounds with multiple
lines will be put on the next line.
2018-03-12 07:48:31 +09:00
Nick Cameron
af5d3cc87b
Merge pull request #2524 from topecongiro/issue-2523
...
Do not unindent code block in comments with unformattable macro
2018-03-12 11:21:09 +13:00
topecongiro
c3e76bc02c
Add a test for #2523
2018-03-09 17:09:56 +09:00
Seiichi Uchida
e9f5382757
Add a test for #2510
...
Closes #2510 .
2018-03-09 14:07:43 +09:00
Nick Cameron
dc2f1429e7
Merge pull request #2521 from topecongiro/issue-2520
...
Fix bugs when rewriting doc comments with code block
2018-03-09 15:18:53 +13:00
Nick Cameron
58fb47a8ca
Merge pull request #2519 from topecongiro/nested-parens
...
Remove nested parens
2018-03-09 15:16:30 +13:00
Seiichi Uchida
484469899b
Keep code block without correct backticks enclosing
2018-03-09 09:46:43 +09:00
Seiichi Uchida
0acc0a2989
Add a test for #2520
2018-03-09 09:28:49 +09:00
Seiichi Uchida
06f5d55dde
Add a test for removing nested parens
2018-03-08 20:25:06 +09:00
Seiichi Uchida
b2d3daccfa
Add a test for #2491
2018-03-08 19:08:32 +09:00
moe
a2f861730e
fix adds a trailing comma to struct-like macro ( #2490 )
...
* fix adds a trailing comma to struct-like macro
2018-03-08 18:05:39 +09:00
Seiichi Uchida
0e660e4c76
Add a test for #2493
2018-03-08 17:16:42 +09:00
Nick Cameron
06d509c25c
Merge pull request #2512 from topecongiro/rustc-ap-syntax
...
Update rustc-ap-syntax
2018-03-08 17:13:05 +13:00
Shotaro Yamada
b3fa50db73
Use nested_shape for indenting types of lazy_static
2018-03-07 10:51:28 +09:00
Seiichi Uchida
0393037d6e
Add tests for #2398
2018-03-06 19:42:55 +09:00
Seiichi Uchida
3fc8bb19a6
Add tests for #2511
2018-03-06 19:42:38 +09:00
kngwyu
f8f5d5c68c
add tests for 2506
2018-03-05 17:35:58 +09:00
Seiichi Uchida
cea5a92a6c
Add a test for #2482
2018-03-02 21:53:13 +09:00
Nick Cameron
4f522794ae
Tidy up and pass tests
2018-03-02 15:07:13 +13:00
topecongiro
4af2aa3a9e
Create rustfmt_core crate
2018-02-07 22:48:05 +09:00
topecongiro
5e0c6f9716
Avoid orphan in chain with punctuation
2018-02-06 09:36:29 +09:00
Seiichi Uchida
d85e1db178
Merge pull request #2393 from RReverser/macro_rules
...
Format stable macro_rules
2018-02-05 09:56:26 +09:00
topecongiro
18ba02ea70
Add a test for #2208
...
Closes #2208 .
2018-02-05 08:38:53 +09:00
Ingvar Stepanyan
6377c52233
Fix comment handling in macros
2018-02-04 11:54:03 +00:00
Ingvar Stepanyan
70e7716262
Comments WIP
2018-02-04 11:54:03 +00:00
Ingvar Stepanyan
fef3e03d3e
Add repetition example
2018-02-04 11:53:10 +00:00
Ingvar Stepanyan
c750442e04
Add macro_rules tests
2018-02-04 11:53:09 +00:00
Seiichi Uchida
9273a72420
Add tests for reorder_extern_crates
2018-02-04 12:07:51 +09:00
Seiichi Uchida
61b23a4293
Skip rewriting macro def with repeat
2018-02-04 08:52:50 +09:00
Nick Cameron
b7f01769f9
Merge branch 'master' into init-shorthand
2018-02-01 15:20:01 +13:00
Nick Cameron
918e79bb5a
Merge pull request #2380 from topecongiro/reorder-mods
...
[RFC] Reorder modules alphabetically
2018-02-01 15:18:34 +13:00
csmoe
28bb16a5a0
add a support for immovable generators
2018-01-30 22:14:33 +08:00
Seiichi Uchida
c9c346a89f
Add 'use_field_init_shorthand' config option
2018-01-29 22:15:20 +09:00
Seiichi Uchida
56c6d73d82
Reorder modules
...
Add `reorder_modules` config option.
Two things we must keep in mind when reordering modules:
1. We should not reorder modules with attributes, as doing so could
potentially break the code (e.g. `#[macro_use]`).
2. We should not reorder inline modules e.g. `mod foo { /* .. */ }`.
We should only reorder module declarations e.g. `mod foo;`.
Some open questions:
1. Should we bring modules with `pub` in front of those without `pub`
so that they stand out from others?
2. Instead of keeping modules with attributes in the same place,
can we bring them in front of others? Is this safe?
2018-01-29 21:59:15 +09:00
Nick Cameron
4633786848
Merge pull request #2396 from topecongiro/issue-2389
...
Put attributes and enum variants on different lines
2018-01-29 10:36:26 +11:00
Seiichi Uchida
c60d865b98
Put attributes and enum variants on different lines
2018-01-26 16:20:00 +09:00
Seiichi Uchida
fff59fe8d9
Add a test for field initialization shorthand
2018-01-22 13:03:48 +09:00
David Alber
69f27673df
Extending spaces_around_ranges
to ranges in match arm patterns
2018-01-21 16:50:17 -08:00
Seiichi Uchida
298f29a57d
Do not panic when special macros have less args than expected
2018-01-18 00:50:16 +09:00
Nick Cameron
74a957e80f
Merge pull request #2357 from topecongiro/issue-2342
...
Put attributes and struct fields on different line by default
2018-01-12 17:32:55 +13:00
Nick Cameron
b356fc06f7
Merge pull request #2352 from topecongiro/issue-2337
...
Break after colon if static item does not fit in a single line
2018-01-12 17:31:12 +13:00
Seiichi Uchida
6e05ca87b0
Add a test for #2343 and update tests
2018-01-11 16:53:13 +09:00
Seiichi Uchida
279acda4c4
Remove same_line_attributes config option
2018-01-11 16:52:28 +09:00
Seiichi Uchida
eaab51db2e
Break after colon if static item does not fit in a single line
2018-01-10 23:23:42 +09:00
Seiichi Uchida
1e7ff38c2d
Add a test for #2256
2018-01-10 21:30:13 +09:00
Nick Cameron
91a332483b
Merge pull request #2316 from topecongiro/issue-2315
...
Remove trailing comma from extern items snippet before comparing
2018-01-04 17:49:47 +13:00
topecongiro
75cb236711
Compare extern crate items with its name instead of span
...
When we use span, bugs easily sneak in.
2018-01-04 12:49:37 +09:00
topecongiro
a6d609b45e
Add and update tests for #2320 and #2331
2018-01-04 12:46:05 +09:00
Nick Cameron
9368de276c
Merge pull request #2327 from nrc/macro-defs
...
Some macros 2.0 macro defs
2018-01-04 14:02:37 +13:00
Nick Cameron
e52b383a57
Merge pull request #2306 from dtwood/assert-eq-on-one-line
...
Add assert_eq! to special-cased macros
2018-01-04 13:42:24 +13:00
Nick Cameron
aa758d671f
Better handling of comments in macro defs
2018-01-03 20:36:52 +13:00
Nick Cameron
47d9ccd6a1
Tests for formatting macro 2.0 defs
2018-01-01 19:51:54 +13:00
David Alber
aa70bbe377
Moving test files to satisfy verify_config_test_names
test
2017-12-28 10:29:48 -08:00
David Alber
6939e21f43
Moving config option tests to subdirectory
...
This was done by running the following.
```sh
for f in `find . -name "configs-*.rs"`; do
topdir=`echo $f | cut -d/ -f2`;
configname=`echo $f | cut -d/ -f3 | cut -d- -f2`;
testname=`echo $f | cut -d/ -f3 | cut -d- -f3`;
mkdir -p $topdir/configs/$configname;
git mv $f $topdir/configs/$configname/$testname;
done
```
2017-12-28 10:29:48 -08:00
David Alber
8fb3342ca2
Renaming tests to match existing convention
2017-12-28 10:29:48 -08:00
David Alber
6a583399ff
Renaming test to match existing convention
2017-12-28 10:29:48 -08:00
David Wood
39e2f43f91
Split assert_eq! if any arguments are not simple
2017-12-27 21:19:42 +00:00
Seiichi Uchida
f523ec58ab
Do not give up rewriting struct field when attribute is long
2017-12-24 13:57:29 +09:00
David Wood
ef8b2efd13
Fix off-by-one error in assert_eq! line wrapping
...
If two really long conditions are checked for equality, they wouldn't be split
into multiple lines if the last condition is the one to push the line past the
width limit.
Fix the off-by-one error that caused this, and add a test-case for it.
2017-12-23 01:32:55 +00:00
David Wood
e343521276
Add assert_eq! to special-cased macros
...
Allows for this form of assert_eq! macros:
```rust
assert_eq!(
left.id, right.id,
"IDs are not equal: {:?} {:?}",
left, right
);
```
Also allows for assert! macros to have the format arguments split across
multiple lines even if the assert condition is not simple:
```rust
assert!(
result >= 42,
"The result must be at least 42: {:?}",
result, result.code, context
);
```
2017-12-23 01:06:17 +00:00
topecongiro
984ac100a4
Fix indent width bug when recovering comments
...
Using last_line_width() ignores the width of tab character ('\t').
2017-12-22 12:05:36 +09:00
Nick Cameron
723b938057
Merge pull request #2291 from topecongiro/issue-2289
...
Take the width of block's prefix into account only once
2017-12-22 12:58:02 +13:00
topecongiro
366ff40ae7
Take the width of block's prefix into account only once
2017-12-20 15:44:11 +09:00
topecongiro
4f7cbc3aad
Add tests for trait aliases
2017-12-15 13:47:32 +09:00
Nick Cameron
fc52a4d33f
Merge pull request #2173 from topecongiro/assignment-with-100-chars
...
Assignment whose lhs has 100 chars
2017-12-11 17:04:41 +13:00
Nick Cameron
3c08da3433
Merge pull request #2270 from topecongiro/issue-2260
...
Trim a trailing whitespace on empty line inside code block comment
2017-12-11 16:40:12 +13:00
Seiichi Uchida
a16a5b4c2e
Add a test fot #2260
2017-12-11 11:40:59 +09:00
Nick Cameron
0c9b2b402e
Merge pull request #2267 from topecongiro/issue-2264
...
Remove block() and block_only() wherever possible
2017-12-11 09:02:16 +13:00
Nick Cameron
08022ec1a3
Merge pull request #2265 from topecongiro/issue-2262
...
Fix bugs related to closures
2017-12-11 09:00:56 +13:00
Nick Cameron
5da2d7be32
Merge pull request #2258 from topecongiro/issue-819
...
Format macro in pattern position
2017-12-11 08:54:02 +13:00
Seiichi Uchida
b749aa0699
Add a test fot #2264
2017-12-10 23:38:30 +09:00
Seiichi Uchida
4110c7b8c5
Add a test for #2262
2017-12-10 21:19:51 +09:00
Seiichi Uchida
0909ecbac7
Add tests for macro in pattern position
2017-12-10 00:21:49 +09:00
Seiichi Uchida
d4a569848e
Add tests for nested imports
2017-12-09 16:45:20 +09:00
Seiichi Uchida
23fa0bc3ef
Merge pull request #2240 from davidalber/revisit-2219
...
Adding `print!` to the list of specially-formatted `format!`-like macros
2017-12-07 17:37:01 +09:00
David Alber
9a25458179
Adding tests for assert!
, write!
, and writeln!
2017-12-06 22:42:33 -08:00
Nick Cameron
b07e4339f0
Merge pull request #2221 from topecongiro/rfc/blank-lines
...
Keep vertical spaces between items or statements within range
2017-12-06 15:52:19 +13:00
David Alber
eb42956e84
Adding print!
specially-formatted format!
-like macros list
...
This commit corrects what appears to be an accidental inclusion of
`panic!` twice in the list resulting from the union of ffbe52e
and
aeb3398
.
2017-12-05 16:56:56 -08:00
David Alber
8c51122f54
Adding tests for all specially-formatted format!
-like macros
2017-12-05 16:56:36 -08:00
Seiichi Uchida
9ed05410a3
Add more tests
2017-12-05 17:45:19 +09:00
Seiichi Uchida
2302e904e9
Add a test for 'blank_lines_lower_bound = 1'
2017-12-05 17:38:07 +09:00
Nick Cameron
ae51f69de4
Merge pull request #2239 from topecongiro/issue-2157
...
Fix double indented chained closure
2017-12-05 16:56:52 +13:00
Seiichi Uchida
b45a69699a
Add a test for #2157
2017-12-05 10:02:49 +09:00
Seiichi Uchida
ab8129069a
Add a test for #1209
2017-12-05 08:41:10 +09:00
topecongiro
72cac8beae
Add a test for special case macros like format! and assert!
2017-12-03 11:34:18 +09:00
Nick Cameron
8f6b6c28f7
Merge pull request #2210 from topecongiro/issue-2178
...
Combine a short callee and a single argument
2017-12-01 15:02:16 +13:00
topecongiro
5aaa00a929
Add a test for #2214
2017-11-30 22:12:55 +09:00
topecongiro
0f6b4977dd
Add a test for #2178
2017-11-30 15:00:13 +09:00
Seiichi Uchida
35aa1dc992
Add a test for #2207
2017-11-30 06:10:50 +09:00
topecongiro
4720462e67
Add a test for #2200
2017-11-29 12:34:09 +09:00
topecongiro
3d7d978fe8
Add a test for #2193
2017-11-27 20:53:54 +09:00
Nick Cameron
fcb48786c8
Merge pull request #2191 from topecongiro/issue-2190
...
Recover from failing to format variants even where there is no comment
2017-11-27 18:14:08 +13:00
Nick Cameron
f0af1d4818
Remove CompressedIfEmpty option from fn_args_density
...
It was identical to Tall
2017-11-27 17:49:55 +13:00
topecongiro
9ece82f9ea
Add a test for #2190
2017-11-27 13:49:53 +09:00
Nick Cameron
677446e99d
Merge fn_empty_single_line and impl_empty_single_line into empty_item_single_line
2017-11-27 17:46:09 +13:00
Nick Cameron
9a33255834
Rename wrap_match_arms to match_arm_blocks
2017-11-27 17:35:27 +13:00
Nick Cameron
8f4d85a9d7
Merge multiline_closure_forces_block and multiline_match_arm_forces_block into force_multiline_block
2017-11-27 17:03:54 +13:00
Nick Cameron
087f8b5854
Remove match_arm_forces_newline
2017-11-27 16:31:49 +13:00
Nick Cameron
0e1fa2c244
Remove indent_match_arms
2017-11-27 15:49:14 +13:00
Nick Cameron
86007e7d17
Remove where_density
and where_layout
options
...
There is a choice between block and visual indent for where clauses, plus the
single line option. I think these two are too fine-grained to be useful.
2017-11-24 21:08:24 +13:00
Nick Cameron
abfa4a1473
Merge pull request #2184 from topecongiro/issue-2179
...
Put rhs on the same line as lhs if putting rhs on next line exceeds max width
2017-11-24 20:19:12 +13:00
Nick Cameron
dd1fbca99a
Replace various small width heuristics with a single option
...
Closes #1984
2017-11-24 20:17:06 +13:00
topecongiro
cb5c3a9914
Add a test for #2179
2017-11-24 12:04:00 +09:00
Nick Cameron
96886cd67f
Fix a typo in the unstable options handling and address fallout
2017-11-24 15:41:27 +13:00
Nick Cameron
f891d04c87
Some tests I renamed in a previous commit and forgot to git add
2017-11-24 14:46:33 +13:00
Nick Cameron
45d4f7a2dd
struct_lit_multiline_style -> struct_lit_single_line (and make it a bool)
2017-11-24 14:45:18 +13:00
Nick Cameron
20805acf42
Merge attributes_on_same_line_as_field
and attributes_on_same_line_as_variant
into same_line_attributes
2017-11-24 14:29:44 +13:00
Nick Cameron
4cb474b5ee
Remove force_format_strings
in favour of format_strings
2017-11-24 14:07:37 +13:00
Nick Cameron
8a7b6b8806
Remove match_pattern_separator_break_point
in favour of binop_separator
2017-11-24 14:01:44 +13:00
Nick Cameron
179b3c59de
Remove legacy option fn_args_paren_newline
2017-11-24 13:27:14 +13:00
Nick Cameron
4f65124422
Remove legacy option fn_return_indent
2017-11-24 13:19:36 +13:00
Nick Cameron
d0f12b8ec8
Remove unused option take_source_hints
2017-11-24 13:08:02 +13:00
topecongiro
334b410785
Add a test for #2111
2017-11-23 12:36:57 +09:00
topecongiro
c2804589a1
Add a test for assignment whose lhs is exactly 100 chars
2017-11-21 08:50:55 +09:00
topecongiro
44d81d9e0e
Add a test for #2171
2017-11-20 16:38:15 +09:00
topecongiro
3de7a56267
Add a test for #2164
2017-11-18 15:32:10 +09:00
topecongiro
b3a3d5b164
Add a test for #1809
2017-11-16 16:01:50 +09:00
topecongiro
37b6855d9d
Add a test for #2158
2017-11-16 11:26:12 +09:00
topecongiro
f9f4ef8177
Add a test for #1603
2017-11-15 15:44:27 +09:00
topecongiro
bf775785e0
Add a test for #2151
2017-11-15 12:22:50 +09:00
Nick Cameron
a90b76a731
Merge pull request #2153 from topecongiro/issue-2152
...
Return None when a literal exceeds budget
2017-11-15 15:43:03 +13:00
topecongiro
00318c400b
Add a test for #2152
2017-11-15 10:36:42 +09:00
topecongiro
575ae22a5f
Update tests related to spaces with parens and brackets
2017-11-14 23:37:27 +09:00
topecongiro
15ded04f46
Update tests related to colon spacing
2017-11-14 23:25:10 +09:00
topecongiro
f8074b340d
Combine fn_brace_style and item_brace_style
2017-11-14 10:47:02 +09:00
topecongiro
0d721241f4
Change chain_indent to indent_style
2017-11-13 17:33:32 +09:00