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
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
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
Seiichi Uchida
7c9aee78f0
Update tests
2017-07-26 22:43:50 +09:00