topecongiro
0922f3f427
Update tests
2017-11-10 17:08:26 +09:00
topecongiro
a9647f1108
Add a test for #2025
2017-11-10 17:08:16 +09:00
Nick Cameron
560f66cfe3
Merge pull request #2130 from topecongiro/soft-wrapping-doc-comments
...
Soft wrapping doc comments
2017-11-09 16:12:27 +13:00
topecongiro
61bca9c083
Update a test
2017-11-08 18:24:18 +09:00
topecongiro
b7f69ce776
Add a test for soft wrapping on doc comments
2017-11-08 18:23:21 +09:00
Nick Cameron
0c250d0e5d
Merge pull request #2128 from topecongiro/issue-2125
...
Wrap long single field tuple struct
2017-11-08 21:11:21 +13:00
topecongiro
bbfdb12c3e
Add a test for #2125
2017-11-08 11:52:14 +09:00
topecongiro
d2d5ebe4da
Add a test for #2126
2017-11-08 08:25:09 +09:00
Afshin Mehrabani
f412c875ea
Adding where_single_line option ( #2030 )
...
* feat(where): adding where_single_line option and tests
* fix(where): adding more tests
* feat(where): changing the shape of where clause when where_single_line is true
* feat: newline_for_brace should avoid adding a new line where where_single_line is true
* fix(items): where_single_line should bypass the multi-item where clauses
* fix(items): refactoring and removing redundant variables
* fix(items): where_single_line should not be functional when args are multilined
* fix(config): fixing conflict with upstream
2017-11-06 11:53:17 +13:00
Nick Cameron
f1035d9782
Merge pull request #2116 from topecongiro/config-options-indent
...
Rename config options related to indent
2017-11-06 08:43:12 +13:00
Nick Cameron
15894e94ef
Merge pull request #2115 from topecongiro/chain_width
...
Rename 'chain_one_line_max' to 'chain_width'
2017-11-06 08:38:37 +13:00
Nick Cameron
0b481ceced
Merge pull request #2113 from topecongiro/issue-2110
...
Use correct span for tuple struct's body
2017-11-06 08:21:56 +13:00
Seiichi Uchida
1e4c2fb713
Merge pull request #2117 from adeschamps/issue-2103
...
Handle case where there is a where clause but no generic parameters.
2017-11-05 05:27:36 +09:00
Anthony Deschamps
18ac341413
Handle case where there is a where clause but no generic parameters.
...
Fixes #2103
2017-11-04 15:25:09 -04:00
topecongiro
9cd5d88854
Rename test files
2017-11-04 22:49:21 +09:00
topecongiro
40c5666af6
Rename 'struct_lit_style' to 'struct_lit_indent'
2017-11-04 22:47:28 +09:00
topecongiro
d5d8740993
Rename 'fn_call_style' to 'fn_call_indent'
2017-11-04 22:46:40 +09:00
topecongiro
55c2000d94
Rename 'fn_args_layout' to 'fn_args_indent'
2017-11-04 22:45:47 +09:00
topecongiro
5096cdff56
Rename 'array_layout' to 'array_indent'
2017-11-04 22:45:09 +09:00
topecongiro
619bc91081
Change test files' name
2017-11-04 22:30:26 +09:00
topecongiro
d287b06eba
Rename 'chain_one_line_max' to 'chain_width'
2017-11-04 22:24:43 +09:00
topecongiro
af3d793e30
Add more tests
2017-11-03 23:38:32 +09:00
topecongiro
691bc3bbd7
Add a test for structs with visibility
2017-11-03 22:25:30 +09:00
Nick Cameron
f15dd870d1
Merge pull request #1877 from topecongiro/overflowing-closure-with-loop
...
Force to use block for closure body with a single control flow expression
2017-11-03 17:08:34 +13:00
topecongiro
b17de6228f
Cargo fmt
2017-11-02 21:45:00 +09:00
topecongiro
49409c0096
Update tests
2017-11-02 21:38:20 +09:00
topecongiro
dc035bbbee
Add a test to see if tuple struct gets combined
2017-11-02 20:28:38 +09:00
Nick Cameron
809e06ee32
Merge pull request #2102 from topecongiro/soft-wrapping-comments
...
Soft wrapping for comments
2017-11-02 15:15:38 +13:00
Martin Lindhe
f930a16b8d
fix some typos
2017-11-01 07:33:55 +01:00
topecongiro
371d2bb939
Add a test for soft wrapping for comments
2017-10-31 15:01:38 +09:00
Nick Cameron
0af8825eb1
Merge pull request #2101 from topecongiro/issue-2099
...
Format match expr with empty body
2017-10-31 08:26:08 +13:00
Seiichi Uchida
271da96098
Add a test for #2098
2017-10-30 23:38:05 +09:00
Seiichi Uchida
792f48c976
Add a test for #2099
2017-10-30 23:37:26 +09:00
Paul Lietar
c1e897907a
Add suport for extern types.
...
See https://github.com/rust-lang/rust/pull/44295
2017-10-30 08:46:11 +13:00
Nick Cameron
5233f9cde0
Add support for crate shorthand for pub(crate)
2017-10-28 18:41:58 +13:00
Nick Cameron
90b3222adb
Merge pull request #2090 from topecongiro/issue-2087
...
Only read the trailing comma of outermost fn call
2017-10-27 15:18:13 +05:30
Nick Cameron
f159d32c1f
Merge pull request #2089 from topecongiro/closure-block-body-with-comment
...
Fix rustfmt failing to format closure block body with comment
2017-10-27 15:17:38 +05:30
Nick Cameron
6cfeb1fa78
Merge pull request #2041 from osa1/match_arm_newline
...
[not ready] Implement match_arm_forces_newline option (#2039 )
2017-10-27 15:17:03 +05:30
topecongiro
daf4789b76
Add a test for #2087
2017-10-27 16:35:40 +09:00
topecongiro
9de9693a45
Add a test
...
rustfmt fails to format a function call when it has a single closure argument
and that closure has a block body which contains comments at the beginnig of
the block, and the block only contains a single expression as its statement.
Phew!
2017-10-27 15:39:15 +09:00
Nick Cameron
0a59654b41
Merge pull request #2084 from topecongiro/issue-2081
...
Use rewrite_assign_rhs when rewriting unit variant
2017-10-27 02:15:22 +05:30
Nick Cameron
038f711c6e
Merge pull request #2083 from topecongiro/issue-2082
...
Use a correct span for fn with pub(crate) syntax
2017-10-27 02:14:29 +05:30
Nick Cameron
4386fc218b
Merge pull request #2068 from topecongiro/issue-2067
...
Fix a subtle bug in rewriting chain
2017-10-27 01:38:10 +05:30
Ömer Sinan Ağacan
84bea05719
Add tests
2017-10-26 20:20:36 +03:00
topecongiro
a67b8b0bbb
Use rewrite_assign_rhs when rewriting unit variant
2017-10-25 01:08:32 +09:00
topecongiro
7b9a4e6a06
Use a correct span for fn with pub(crate) syntax
2017-10-25 00:51:04 +09:00
Matthew McAllister
1853d02ea9
Handle #![rustfmt_skip] in block statements
2017-10-20 02:37:52 -07:00
Matthew McAllister
108e2cd776
Handle #![rustfmt_skip] at file top level
2017-10-20 00:22:23 -07:00
topecongiro
8b7defdb19
Add a test for #2067
2017-10-18 22:23:25 +09:00
Seiichi Uchida
7cbdf35f63
Add a test for #2063
2017-10-17 00:12:22 +09:00
Nick Cameron
5798fe6e13
Merge pull request #2045 from topecongiro/issue-2044
...
Simplify multiline case in rewrite_struct_field()
2017-10-13 21:59:13 +08:00
Bryce Van Dyk
f3ceb54d3a
Add a test for issue 1211, showing it's no longer an issue.
...
Since rustfmt has moved away from syntex the overflow seen in issue 1211
is no longer a problem. This commit adds a test to verify that.
2017-10-10 18:51:44 +13:00
Seiichi Uchida
be9b1b5332
Add a test for #2044
2017-10-08 22:37:13 +09:00
Nick Cameron
6c9ee313a2
Merge pull request #2038 from jugglerchris/add_test_skip_attr
...
Add a test that the skip attribute applies to other attributes.
2017-10-07 13:19:15 +08:00
Chris Emerson
27e269ec5b
Add a test that the skip attribute applies to other attributes.
2017-10-06 22:57:59 +01:00
Shohei Wada
fe1619b548
Fix the test framework is failing in CRLF env
2017-10-07 01:53:55 +09:00
Nick Cameron
81f0e9c94e
Merge pull request #2032 from topecongiro/trailing-whitespaces-in-macro-def
...
Remove trailing whitespaces in macro def
2017-10-05 19:34:12 +08:00
topecongiro
00f8610d9b
Add a test
2017-10-05 19:44:45 +09:00
Nick Cameron
69ab2b5f5e
Merge pull request #2023 from topecongiro/issue-2020
...
Use a correct budget for where predicate
2017-10-05 18:09:49 +08:00
Nick Cameron
61043e64e0
Merge pull request #2019 from topecongiro/issue-2018
...
Break after '=' if a single line rhs exceeds max width
2017-10-05 17:30:45 +08:00
Nick Cameron
2abe119d88
Merge pull request #2017 from topecongiro/issue-1987
...
Format strings in attributes when `format_strings = true`
2017-10-05 17:27:17 +08:00
Bryce Van Dyk
3422ebadf3
Uncomment fixme associated with #184 in loop.rs as this issue is fixed.
2017-10-04 22:02:28 +13:00
Seiichi Uchida
1752929983
Update tests
2017-10-02 00:04:58 +09:00
Seiichi Uchida
c0997260ba
Update tests
2017-10-01 21:21:20 +09:00
topecongiro
bdcd36e677
Add a test for #1987
2017-10-01 20:30:32 +09:00
Nick Cameron
6e41100725
Merge pull request #2005 from topecongiro/issue-2003
...
Put the opening brace of fn body on the next line if it exceeds max width
2017-09-29 21:27:37 +08:00
Nick Cameron
ce62f0a7ec
Merge pull request #1997 from topecongiro/issue-1995
...
Fix a budget bug in Arg::rewrite()
2017-09-29 20:40:53 +08:00
topecongiro
c66560fee6
Add a test for #2003
2017-09-28 20:15:33 +09:00
Badel2
feb7a6a0a6
Replace ... by ..= in range expr tests
2017-09-27 22:47:34 +02:00
topecongiro
dd0dcdf1ac
Fix a budget bug in Arg::rewrite()
2017-09-26 11:20:47 +09:00
opilarium
72a9ad6199
Remove unused import
2017-09-21 22:54:29 +03:00
Nick Cameron
bdf791a174
Comment out stdin_disable_all_formatting_test
2017-09-21 20:06:44 +12:00
topecongiro
0779962a6e
Add debug logging
2017-09-19 13:46:13 +09:00
topecongiro
2915167179
Cargo fmt and update tests
2017-09-19 11:41:50 +09:00
topecongiro
007c673012
Remove noisy print from test
2017-09-19 11:02:21 +09:00
Nick Cameron
c313fb1ddc
Merge pull request #1973 from topecongiro/issue-1972
...
Echo back input from stdin when disable_all_formatting is true
2017-09-18 18:06:49 +12:00
topecongiro
dc26b069f6
Remove a duplicate test
2017-09-18 14:20:40 +09:00
topecongiro
75a36f2886
Add a test for 'disable_all_formatting = true' with stdin
2017-09-18 14:19:50 +09:00
Nick Cameron
d906ea23c7
Merge pull request #1968 from topecongiro/issue-1967
...
Reorder use items inside blocks
2017-09-18 12:59:25 +12:00
Seiichi Uchida
bb4a6bf66a
Update tests
2017-09-15 22:32:03 +09:00
topecongiro
2d21c0c30b
Split after the colon of type ascription
2017-09-15 15:04:30 +09:00
topecongiro
ff30782725
Update tests
2017-09-15 12:20:58 +09:00
Nick Cameron
a1fd68da46
Merge pull request #1948 from topecongiro/issue-1137
...
Use write_list() to format imports
2017-09-07 17:35:14 +12:00
topecongiro
0d748cf4c8
Update tests
2017-09-06 18:48:09 +09:00
Seiichi Uchida
97d9e6b373
Use the last line's width for indent width in rewriting missed span
...
to fix unindented comments
2017-09-05 16:54:02 +09:00
Nick Cameron
435ab867c3
Merge pull request #1945 from topecongiro/issue-1095
...
Exclude prefix colon from span when rewriting comment
2017-09-05 11:00:31 +12:00
Nick Cameron
84e7ef0ab7
Merge pull request #1944 from topecongiro/issue-1943
...
Take attributes_on_same_line_as_field into account
2017-09-05 10:53:36 +12:00
Seiichi Uchida
c720a3a38e
Remove colon from faulty span
2017-09-05 01:04:31 +09:00
topecongiro
467b7b5a6c
Take attributes_on_same_line_as_field into account
2017-09-04 16:15:32 +09:00
topecongiro
47062c8f0a
Format long derive
2017-09-03 08:14:00 +09:00
topecongiro
f8bdcd62e8
Do not allow single-lined closure with block body
2017-09-03 08:10:12 +09:00
Nick Cameron
59d1e84259
Merge pull request #1937 from topecongiro/enhance-macro-rewrite
...
Enhance macro rewrite
2017-08-31 17:43:52 +12:00
Nick Cameron
d08405eed6
Merge pull request #1931 from topecongiro/cargo-clippy
...
Apply refactoring from cargo clippy
2017-08-31 17:18:45 +12:00
topecongiro
848d4559e1
Enhance macro rewrite
2017-08-31 13:52:13 +09:00
Seiichi Uchida
4b79055a15
Apply refactoring from cargo clippy
2017-08-31 12:49:12 +09:00
topecongiro
16894b9cd2
Put the closing brace of empty enum on the same line with the opening brace
2017-08-31 12:44:40 +09:00
Vadim Petrochenkov
6e5c6f5ba3
Use getters to access Span fields
2017-08-31 14:14:13 +12:00
topecongiro
979d131c5d
Format and preserve attributes on ast::Stmt
2017-08-30 19:27:36 +09:00
Seiichi Uchida
404e2db046
Remove unused extern crate
2017-08-28 23:43:49 +09:00
Nick Cameron
7298ce9d52
Merge pull request #1925 from topecongiro/enhance-comment
...
Enhance comment formatting
2017-08-28 09:33:08 +12:00
Nick Cameron
4b90fb140f
Merge pull request #1924 from topecongiro/issue-1922
...
Fix a typo in calculating overhead for fn args
2017-08-28 09:08:18 +12:00
Nick Cameron
536db5b83f
Merge pull request #1923 from topecongiro/issue-1920
...
Allow pre-line single-lined comments to stay on the same line
2017-08-28 09:07:35 +12:00
topecongiro
25bf1741b2
Update tests
2017-08-28 00:18:17 +09:00
topecongiro
ef84319e47
Fix a typo in calculating overhead for fn args
2017-08-27 14:57:21 +09:00
topecongiro
74834c3f7f
Update tests
2017-08-27 14:41:30 +09:00
topecongiro
343b315830
Handle macros with tabs
2017-08-27 13:44:49 +09:00
topecongiro
24efc3a934
Ignore empty lines inside arguments of macro with brace
2017-08-25 22:35:22 +09:00
topecongiro
34cf16436a
Add a test for #1914 and #1915
2017-08-25 08:20:11 +09:00
topecongiro
669a139956
Only merge consecutive derives
2017-08-24 23:48:18 +09:00
topecongiro
5dafcc24e4
Add merge_derives config option
2017-08-24 22:29:56 +09:00
Nick Cameron
ba6121c4e2
Merge pull request #1898 from spinda/overflow-controls
...
Add overflow_closures and overflow_match_arms opts
2017-08-24 18:10:51 +12:00
Michael Smith
411c73c12f
Add multiline_{closure,match_arm}_forces_block
...
multiline_closure_forces_block = false (default):
result.and_then(|maybe_value| match maybe_value {
None => ...,
Some(value) => ...,
})
multiline_closure_forces_block = true:
result.and_then(|maybe_value| {
match maybe_value {
None => ...,
Some(value) => ...,
}
})
multiline_match_arm_forces_block = false (default):
match lorem {
None => if ipsum {
println!("Hello World");
},
Some(dolor) => ...,
}
multiline_match_arm_forces_block = true:
match lorem {
None => {
if ipsum {
println!("Hello World");
}
}
Some(dolor) => ...,
}
2017-08-21 14:05:20 -07:00
Seiichi Uchida
a18a40cbc1
Add indent to macro we could not format
2017-08-21 23:19:01 +09:00
Nick Cameron
7e171836c6
Merge pull request #1900 from spinda/attributes-on-same-line
...
Add attributes_on_same_line_as_{field,variant} configs
2017-08-21 11:26:36 +12:00
Nick Cameron
88cb142173
Merge pull request #1895 from topecongiro/configs-match_pattern_separator_break_point
...
Add mach_pattern_separator_break_point config option
2017-08-21 09:30:34 +12:00
Michael Smith
baafa4f011
Fix wrapping of bounds in associated types
...
Bounds were wrapped to the full width of the line rather then the width
available after the "type ...: ", resulting in rustfmt unnecessarily producing
lines that were longer than the maximum width.
2017-08-19 15:30:53 -07:00
Michael Smith
1c9d044c05
Add attributes_on_same_line_as_{field,variant}
2017-08-19 15:09:10 -07:00
Seiichi Uchida
5cf05a2992
Update tests
2017-08-18 23:20:12 +09:00
Nick Cameron
c166004e6d
Merge pull request #1888 from topecongiro/no-panic-against-invalid-attr
...
Do not panic against files with invalid attributes
2017-08-16 16:28:15 +12:00
Nick Cameron
02cb9a134d
Merge pull request #1886 from topecongiro/issue-1882
...
Obey to `array_layout` when using mixed tactic for array
2017-08-16 16:27:37 +12:00
topecongiro
528200009a
Do not panic against files with invalid attributes
2017-08-16 00:11:20 +09:00
Seiichi Uchida
4fd9920a2d
Obey to array_layout when using mixed tactic for array
2017-08-15 22:10:39 +09:00
Seiichi Uchida
a1d28bf41c
Merge pull request #1872 from sinkuu/remove_newline
...
Remove blank lines at start or end of block
2017-08-15 00:28:31 +09:00
Nick Cameron
16920fb5c5
Merge pull request #1879 from topecongiro/issue-1878
...
Use correct width for subexpr_list
2017-08-14 11:10:28 +12:00
Nick Cameron
3ab3fb2215
Merge pull request #1875 from topecongiro/empty-tuple-pattern
...
Allow empty tuple pattern
2017-08-14 11:05:39 +12:00
topecongiro
10f1257eb3
Use correct width for subexpr_list
2017-08-13 10:17:52 +09:00
topecongiro
02d82f926e
Allow empty tuple pattern
2017-08-12 16:01:03 +09:00
topecongiro
f35a420597
Update tests
2017-08-11 17:54:30 +09:00
topecongiro
2376582dfb
Update tests
2017-08-11 17:54:20 +09:00
sinkuu
fea3080f91
Format
2017-08-11 17:44:16 +09:00
sinkuu
b433e63d2a
Remove unnecessary blank lines at the start and the end of a block
2017-08-11 17:44:16 +09:00
topecongiro
0bb998685d
Cover comments between function args and the brace
2017-08-10 23:11:18 +09:00
topecongiro
e69a2aba18
Add error_on_line_overflow_comments config option
2017-08-10 08:13:20 +09:00
Nick Cameron
62689ef568
Merge pull request #1861 from topecongiro/refactor-chain
...
Remove unnecessary rewriting
2017-08-10 09:03:45 +12:00
Nick Cameron
7da776423a
Merge pull request #1864 from topecongiro/reorder-extern-crates
...
Reorder extern crates
2017-08-09 20:45:49 +12:00
Seiichi Uchida
f9239dd630
Format source codes and update tests
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
topecongiro
c28df858c7
Format source codes and update tests
2017-08-09 00:16:35 +09: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
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
topecongiro
6f24c64673
Update tests
2017-08-05 15:24:20 +09:00
Seiichi Uchida
697e9485f7
Update tests
2017-08-02 23:28:52 +09:00
Seiichi Uchida
d2acd99703
Update tests
2017-08-01 22:27:12 +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
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
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
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
