Commit graph

1994 commits

Author SHA1 Message Date
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
Nick Cameron
bc9c65a2ac 0.2.2 2017-08-22 13:09:13 +12:00
Nick Cameron
da8a07f146 Merge pull request #1907 from topecongiro/issue-1885
Add indent to macro we could not format
2017-08-22 12:58:27 +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
d7b5e7de54 Merge pull request #1906 from topecongiro/remove_count_missing_closing_parens
Remove count_missing_closing_parens()
2017-08-21 10:12:30 +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
Seiichi Uchida
4fcbf7f489 Merge pull request #1904 from spinda/assoc-types-bounds-fix
Fix wrapping of bounds in associated types
2017-08-20 23:37:15 +09:00
topecongiro
3d1b6fe1c6 Remove count_missing_closing_parens() 2017-08-20 23:23:13 +09: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
6fb17c4130 Merge pull request #1896 from spinda/fix-typos
Fix typos
2017-08-19 12:42:27 +09:00
Michael Smith
b2d10e39b4
Fix typos in comment 2017-08-18 17:11:35 -07:00
Michael Smith
2471248370
Fix typo in comment line overflow message
s/error_on_lineoverflow_comments/error_on_line_overflow_comments
2017-08-18 17:11:29 -07:00
Seiichi Uchida
5cf05a2992 Update tests 2017-08-18 23:20:12 +09:00
Seiichi Uchida
63ac49638b Support match_pattern_separator_break_point config option 2017-08-18 23:19:47 +09:00
Seiichi Uchida
a3567cec94 Add mach_pattern_separator_break_point config option 2017-08-18 23:19:11 +09:00
Seiichi Uchida
f9d279576f Use write_list() for rewriting match arms 2017-08-18 23:15:56 +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
Nick Cameron
beb88abd08 Merge pull request #1884 from topecongiro/better-error-report
Enhance error messages
2017-08-16 11:41:39 +12:00
topecongiro
528200009a Do not panic against files with invalid attributes 2017-08-16 00:11:20 +09:00
Seiichi Uchida
e9199fd25e Update visual guide 2017-08-15 22:10:55 +09:00
Seiichi Uchida
4fd9920a2d Obey to array_layout when using mixed tactic for array 2017-08-15 22:10:39 +09:00
topecongiro
5c50766b36 Print error messages with colors if possible 2017-08-15 16:54:18 +09:00
topecongiro
67285f15eb Enhance error messages
with rustc style
2017-08-15 16:54:07 +09:00
topecongiro
4c39e5aeb8 Add fields to FormattingError
is_comment is set to true if the error happened inside comment.
line_buffer is the line which overflowed.
2017-08-15 16:52:11 +09:00
topecongiro
222ae15c7b No more sorry 2017-08-15 16:49:54 +09:00
topecongiro
831db35a83 Move isatty() to utils.rs 2017-08-15 16:49:02 +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
284f3c5aca Merge pull request #1876 from Marwes/patch-1
Explain how to solve missing dll's on Windows
2017-08-14 11:06:06 +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
Nick Cameron
c3b22a2a85 Merge pull request #1829 from topecongiro/issue-1046
Allow attributes to stay on the same line with fields
2017-08-14 09:52:28 +12:00
topecongiro
10f1257eb3 Use correct width for subexpr_list 2017-08-13 10:17:52 +09:00
sinkuu
f9ee060eae Use utils::inner_attributes 2017-08-12 18:28:28 +09:00
sinkuu
955b25625d Use attribute span 2017-08-12 18:28:28 +09:00
Markus Westerlind
0c44732136 Explain how to solve missing dll's on Windows
cc #1736
2017-08-12 09:38:12 +02:00
topecongiro
02d82f926e Allow empty tuple pattern 2017-08-12 16:01:03 +09:00
topecongiro
a763f3b75b Cargo update 2017-08-11 17:54:54 +09:00
topecongiro
840edb2c4f Remove 'mut' notation 2017-08-11 17:54:38 +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
topecongiro
a4e0fe2b02 Allow attributes to stay on the same line with fields 2017-08-11 17:52:49 +09:00
topecongiro
0af19985fc Generalize combine_attr_and_expr 2017-08-11 17:52:13 +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