Commit graph

1841 commits

Author SHA1 Message Date
Nick Cameron
e8494d7a0b Merge pull request #1709 from theotherphil/master
Fix defaults in Configurations.md
2017-06-20 16:29:01 +12:00
Seiichi Uchida
f74be44b1c Merge pull request #1732 from olson-sean-k/issue-1377
Keep brace on same line as `match` when using `ClosingNextLine`.
2017-06-20 12:07:03 +09:00
Nick Cameron
c4b662625b Merge pull request #1735 from kogai/public-file-lines
Public file-lines constructor
2017-06-20 13:09:43 +12:00
Nick Cameron
1ebbc3cd68 Merge pull request #1734 from topecongiro/raw-string-literal
Allow extending a chain after raw string literal
2017-06-20 12:29:25 +12:00
Nick Cameron
6f51e9454e Merge pull request #1733 from topecongiro/cargo-fmt
Do not run cargo fmt if there are unnecessary arguments
2017-06-20 12:28:36 +12:00
Nick Cameron
779f037c8d Merge pull request #1728 from topecongiro/trailing-comma
Apply config.trailing_comma wherever possible
2017-06-20 12:22:58 +12:00
Phil Ellison
55c2e3b1a4 Fix control_style example 2017-06-19 19:43:38 +01:00
Sean Olson
ea1df1777b Modify control_brace_sytle test to ensure match braces are formatted correctly. 2017-06-19 08:12:15 -07:00
Seiichi Uchida
53202b4029 Do not run cargo fmt if there are unnecessary arguments 2017-06-19 23:39:59 +09:00
Sean Olson
d7298fbd97 Keep brace on same line as match when using ClosingNextLine for control_brace_style. 2017-06-19 07:14:51 -07:00
Seiichi Uchida
b99f3cb447 Allow extending a chain after raw string literal 2017-06-19 22:06:08 +09:00
shinichi kogai
325d02bcc7 Public file-lines constructor 2017-06-19 21:14:33 +09:00
topecongiro
512c8c1edf Apply config.trailing_comma wherever possible 2017-06-19 16:00:04 +09:00
Nick Cameron
a87a4450aa Merge pull request #1727 from topecongiro/disallow-overflowing-closure
Disallow overflowing closure if there are multiple closures in args
2017-06-19 16:49:29 +12:00
topecongiro
ec4b439484 Disallow overflowing closure if there are multiple closures in args 2017-06-19 12:07:20 +09:00
Nick Cameron
f2fd4fbf2c Merge pull request #1726 from topecongiro/tuple-overflow
Apply the same overflowing rule to tuple as function call
2017-06-19 14:36:50 +12:00
topecongiro
482675cf58 Update tests 2017-06-19 11:25:21 +09:00
topecongiro
0b13420943 Apply the same overflowing rule to tuple as function call 2017-06-19 11:24:36 +09:00
Nick Cameron
cd6092ebf9 nightly-0.1.4 2017-06-19 13:22:42 +12:00
Nick Cameron
82d95cc4e0 Merge pull request #1724 from topecongiro/multiline-string-lit
Align multiline string literal
2017-06-19 13:02:21 +12:00
Nick Cameron
392d34b507 Merge pull request #1711 from topecongiro/combine-control-flow-condition-body
Combine control flow condition and body
2017-06-19 13:00:27 +12:00
Nick Cameron
4368cd391e Merge pull request #1719 from topecongiro/macro-on-rhs
Avoid line break when rhs of assignment is an invalid macro
2017-06-19 13:00:12 +12:00
Nick Cameron
34fa428471 make file_lines::Range public 2017-06-19 12:58:29 +12:00
Seiichi Uchida
75d86eb1a0 Format source codes 2017-06-18 22:45:08 +09:00
Seiichi Uchida
ae9ce7bcd9 Align multiline string literal 2017-06-18 22:44:56 +09:00
Phil Ellison
ba36bbcfe2 Document control_style in Configurations.md 2017-06-18 10:37:05 +01:00
Phil Ellison
40db2af18e Update names on where_style code snippets 2017-06-18 09:34:24 +01:00
Phil Ellison
e9c81cd537 Fix names of possible values for where_style 2017-06-18 08:33:32 +01:00
topecongiro
91bd1fdc86 Format source codes 2017-06-18 14:29:17 +09:00
topecongiro
3dcd3d7fb0 Combine condition and body of control flow
If the condition of control flow expressions ends with closing parens and alike,
put the opening bracket of the body on the same line with closing parens.
2017-06-18 14:27:58 +09:00
Seiichi Uchida
6afb0e856c Avoid line break when rhs of assignment is an invalid macro 2017-06-18 14:25:21 +09:00
Nick Cameron
be18e7af90 Merge pull request #1717 from topecongiro/type-and-generics
Refactor format against types and generics
2017-06-18 15:57:34 +12:00
Nick Cameron
2061f101c7 Merge pull request #1708 from topecongiro/chain-overflow
Allow overflowing the last element of chain if it is originally multi-lined
2017-06-18 15:29:52 +12:00
Seiichi Uchida
4d11faff4b Update tests 2017-06-18 02:16:27 +09:00
Seiichi Uchida
38c30a3e06 Refactor format against types and generics
Previous implementation relied on the fact that rustfmt used visual indent
style as a default. However, since now rustfmt uses block indent style against
most part of the code, we need some refactorings.
2017-06-18 02:00:58 +09:00
Phil Ellison
c0804f8a55 Fix defaults in Configurations.md 2017-06-17 11:22:04 +01:00
topecongiro
0440c2c377 Update tests 2017-06-17 16:57:00 +09:00
topecongiro
54233acc8e Format source codes 2017-06-17 16:56:54 +09:00
topecongiro
92634a8f69 Use correct budget for chain 2017-06-17 16:56:37 +09:00
topecongiro
7132814a71 Fix wrap_str
Use shape.width for the first line and shape.used_width() for the last line.
2017-06-17 16:54:25 +09:00
topecongiro
53273b8547 Try overflowing the last element of chain only if it goes multi line 2017-06-17 16:54:03 +09:00
Seiichi Uchida
59c0e4c746 Merge pull request #1701 from topecongiro/issue-1697
Forbid overflowing closure if its header goes multi lines
2017-06-17 16:25:10 +09:00
topecongiro
e31f5eceac Use correct span for Infer type inside closure header 2017-06-17 15:35:29 +09:00
topecongiro
897d7bdcb9 Add a test for #1697 2017-06-17 15:26:59 +09:00
topecongiro
9b73490491 Update tests 2017-06-17 15:26:59 +09:00
topecongiro
b048fe6b35 Format source codes 2017-06-17 15:26:59 +09:00
topecongiro
ee0e9aeaae Use special rules when overflowing the last argument
When overflowing the last argument of function call, if it is a closure,
we apply some special rules in order to avoid weird formatting.
2017-06-17 15:24:45 +09:00
topecongiro
af57d285aa Use correct budget for function call args 2017-06-17 15:24:45 +09:00
Nick Cameron
06f351664b Merge pull request #1705 from topecongiro/issue-1703
Preserve comments inside attributes
2017-06-17 16:58:11 +12:00
Nick Cameron
67b4f8a40c Merge pull request #1698 from topecongiro/vec-semi
Use correct indentaion for vec! with semicolon
2017-06-17 16:55:43 +12:00