Commit Graph

3951 Commits

Author SHA1 Message Date
Marcus Klaas
659c9b9037 Update indentation heuristics for single arg functions 2015-09-11 00:52:20 +02:00
Marcus Klaas
c680bb4030 Implement basic chain formatting 2015-09-11 00:52:16 +02:00
Marcus Klaas de Vries
1af301c33d Merge pull request #294 from sinhpham/diff_write_mode
Add diff write mode https://github.com/nrc/rustfmt/issues/261
2015-09-11 00:38:09 +02:00
Sinh Pham
e7a5f9327e Add diff write mode https://github.com/nrc/rustfmt/issues/261 2015-09-10 18:30:07 -04:00
Marcus Klaas de Vries
6e4ea7842b Merge pull request #293 from sinhpham/small_style_fixes
Small style fixes.
2015-09-09 19:14:20 +02:00
Sinh Pham
e47646b44b Small style fixes. 2015-09-09 07:56:56 -04:00
Nick Cameron
aa2abc63a0 Merge pull request #288 from marcusklaas/closure-return
Format closures' return types
2015-09-09 09:14:15 +12:00
Marcus Klaas
582aa4f2fe Format closures' return types 2015-09-08 20:56:33 +02:00
Nick Cameron
db79a5aec5 Merge pull request #260 from cburgdorf/struct_lit_force_multiline
Implements struct_lit_force_multiline
2015-09-08 17:01:28 +12:00
Christoph Burgdorf
33c5776d30 Implements struct_lit_force_multiline
With struct_lit_force_multiline set to true
rustfmt won't ever mangle multiple struct properties
into one line.

Fixes #253
2015-09-08 01:25:44 +02:00
Marcus Klaas de Vries
156263a3c4 Merge pull request #251 from marcusklaas/rewrite-list
Add failure mode to `write_list`
2015-09-07 22:23:33 +02:00
Marcus Klaas
f80dcbbd84 Split off binary search 2015-09-07 22:21:56 +02:00
Marcus Klaas
d05a41c773 Add failure mode to write_list 2015-09-07 20:35:25 +02:00
Nick Cameron
8cd63aef13 Merge pull request #289 from sinhpham/fix_278
Fix https://github.com/nrc/rustfmt/issues/278
2015-09-07 16:35:14 +12:00
Sinh Pham
94a26f3c9c Fix https://github.com/nrc/rustfmt/issues/278 2015-09-07 00:30:46 -04:00
Nick Cameron
2a61a989d5 Merge pull request #282 from marcusklaas/qself-fix
Fix qself rewrites without explicit casts
2015-09-07 09:35:29 +12:00
Marcus Klaas
c3cb348169 Fix qself rewrites without explicit casts 2015-09-06 23:18:27 +02:00
Marcus Klaas de Vries
072c54beba Merge pull request #265 from nrc/unsafe_one_line
Single line unsafe blocks
2015-09-06 22:44:06 +02:00
Nick Cameron
8750399ef4 Merge pull request #248 from sinhpham/unicode_string_lit
Unicode string lit
2015-09-07 08:01:06 +12:00
Nick Cameron
e0c197cab4 Single line unsafe blocks 2015-09-07 07:31:02 +12:00
Marcus Klaas de Vries
6c5d3500bb Merge pull request #267 from marcusklaas/rustup4
Work with spanned labels in break and continue
2015-09-05 14:02:51 +02:00
Marcus Klaas
490821ef30 Work with spanned labels in break and continue 2015-09-05 14:00:16 +02:00
Nick Cameron
c838b00d54 Merge pull request #257 from cburgdorf/partial_config
Allow partial rustfmt.toml
2015-09-05 10:11:50 +12:00
Christoph Burgdorf
14a94f0bcd Allow partial rustfmt.toml
With this change one can use a config file
that only specifies a subset of config keys
to overwrite. E.g. a config file that looks like this

struct_trailing_comma = "Never"
struct_lit_trailing_comma = "Never"

Fixes #255
2015-09-05 00:09:26 +02:00
Nick Cameron
f5ee0f0986 Merge pull request #250 from marcusklaas/regtest5
Add regression test for trait reference formatting
2015-09-05 09:54:46 +12:00
Nick Cameron
398416be45 Merge pull request #252 from cburgdorf/improve_help
fix outdated help text
2015-09-05 09:54:11 +12:00
Nick Cameron
110c642a5c Merge pull request #258 from llogiq/master
code improvements suggested by clippy
2015-09-05 09:53:31 +12:00
Andre Bogus
d6c652e33c code improvements suggested by clippy 2015-09-04 23:39:33 +02:00
Christoph Burgdorf
56183ce0e9 fix outdated help text 2015-09-04 21:28:37 +02:00
Marcus Klaas
ba0e0e6ac1 Add regression test for trait reference formatting 2015-09-04 13:58:56 +02:00
Nick Cameron
17302f8967 Merge pull request #246 from nrc/bugs2
Format <foo + 'bar> nicely
2015-09-04 17:07:34 +12:00
Nick Cameron
fb9e051fd8 Format <foo + 'bar> nicely 2015-09-04 17:04:54 +12:00
Sinh Pham
61f642f6f8 Support unicode in string literals. 2015-09-03 23:41:25 -04:00
Nick Cameron
b0baa3d06e Merge pull request #247 from marcusklaas/break-regression-test
Add regression test for bad break span
2015-09-04 10:57:28 +12:00
Marcus Klaas
336759d592 Add regression test for bad break span 2015-09-03 20:15:24 +02:00
Marcus Klaas de Vries
649be92204 Merge pull request #245 from nrc/bugs
Fix a bunch of misc. bugs I found
2015-09-02 21:49:53 +02:00
Nick Cameron
183dac91a3 Fix a bug where struct lits nested in fn calls were over-indented 2015-09-02 15:36:17 +12:00
Nick Cameron
ce4d5aa39c Fix a bug with alignment in one-line match arms 2015-09-02 14:45:56 +12:00
Nick Cameron
a5f8b37eeb Format match expressions properly when they appear on an overflowing line. 2015-09-02 14:29:47 +12:00
Nick Cameron
97e92b35cc Preserve some whitespace between struct fields etc. 2015-09-02 14:11:19 +12:00
Marcus Klaas de Vries
000ea50123 Merge pull request #243 from nrc/fn-decl-2
More function decl variety
2015-09-01 23:44:19 +02:00
Nick Cameron
fae93abbda Support struct-like layouts for fn args 2015-09-02 09:41:08 +12:00
Nick Cameron
f81485d9d6 Rename fn_args_layout to fn_args_density 2015-09-02 08:56:37 +12:00
Nick Cameron
6ca2756a82 Merge pull request #238 from nrc/fn-decl
Customisation of function decls
2015-09-02 08:00:28 +12:00
Nick Cameron
8d81aa1991 Support where clauses on the same line as the function decl where it all fits on one line. 2015-09-02 07:59:54 +12:00
Nick Cameron
0264d926be Merge pull request #241 from marcusklaas/string-reformat
Remove faulty shortcut in `rewrite_string_lit`
2015-09-02 07:43:09 +12:00
Marcus Klaas
1ae2d417b8 Remove faulty shortcut in rewrite_string_lit
Rustfmt would leave the literal unchanged when it did not exceed the column limit in its original position, not considering its position after formatting.
2015-09-01 20:42:07 +02:00
Marcus Klaas de Vries
81c8c020a8 Merge pull request #239 from sinhpham/format_strings_option
Format strings option https://github.com/nrc/rustfmt/issues/202
2015-09-01 20:34:22 +02:00
Marcus Klaas de Vries
1d7bb8fa7e Merge pull request #240 from marcusklaas/rustup2
Rustup
2015-09-01 20:32:09 +02:00
Marcus Klaas
85ddf35385 Rustup
Fix breakage caused by rust commit 2076cdd.
2015-09-01 20:28:38 +02:00