Commit Graph

5175 Commits

Author SHA1 Message Date
Aaron Lobb
cd9e9b5db0 Merged config imports 2015-09-14 13:06:09 -07:00
Nick Cameron
7057f40e5d Merge pull request #316 from marcusklaas/diff-upgrade
Bump diff.rs version
2015-09-15 06:32:01 +12:00
Marcus Klaas
da3d2f57da Bump diff.rs version
This should make the computation of diffs quite a bit faster, which is particularly noticable in tests.
2015-09-14 20:22:07 +02:00
cassiersg
45dedc84a7 Merge pull request #315 from alobb/defaultTomlRemoval
https://github.com/nrc/rustfmt/issues/304
2015-09-14 16:53:47 +02:00
Aaron Lobb
33109a78dc https://github.com/nrc/rustfmt/issues/304 Removed reference to default.toml 2015-09-14 00:38:32 -07:00
Aaron Lobb
8b808de6ff Fixed https://github.com/nrc/rustfmt/issues/291; added output to --help runtime option with possible config values 2015-09-14 00:29:15 -07:00
Nick Cameron
4738d284f2 Merge pull request #309 from marcusklaas/array-literals
Format array literals
2015-09-13 09:20:37 +12:00
Nick Cameron
4debd4d302 Merge pull request #312 from marcusklaas/closure-fix
Prevent generation of bogus comment in some function calls
2015-09-13 09:17:43 +12:00
Marcus Klaas
ffa7e8d599 Prevent generation of bogus comment in some function calls
This would happen when the callee contained parentheses.
2015-09-12 14:31:51 +02:00
Marcus Klaas
7deee6daf5 Format array literals 2015-09-12 00:06:17 +02:00
Nick Cameron
764793b2e6 Merge pull request #307 from marcusklaas/function-arg-ty
Rewrite types in function arguments
2015-09-12 10:01:53 +12:00
Nick Cameron
3fdbb3b97c Merge pull request #310 from marcusklaas/continue-reg-test
Add regression test for bad continue span
2015-09-12 09:52:10 +12:00
Marcus Klaas
436f8663e3 Add regression test for bad continue span 2015-09-11 23:32:13 +02:00
Marcus Klaas
623d6c972a Rewrite types in function arguments 2015-09-11 12:32:34 +02:00
Marcus Klaas de Vries
0b7b3c8725 Merge pull request #216 from marcusklaas/format-fields
WIP: Format expression chains
2015-09-11 00:56:14 +02:00
Marcus Klaas
7f576b0602 General cleanup after rebase 2015-09-11 00:53:21 +02:00
Marcus Klaas
03c660633f Refine chain breaking heuristics
Don't make a single line chain when it is was multi line in the source; allow overflow of the last chain element onto the next lines without breaking the chain.
2015-09-11 00:53:01 +02:00
Marcus Klaas
48d17f54d3 Rebase onto master 2015-09-11 00:53:01 +02:00
Marcus Klaas
a9814149c9 Align dots in chained expressions 2015-09-11 00:53:01 +02:00
Marcus Klaas
95ef9dedb4 Escape quotes in string literals 2015-09-11 00:53:01 +02:00
Marcus Klaas
8e471ece31 Add some tests for match blocks 2015-09-11 00:53:01 +02:00
Marcus Klaas
abe8e7de99 Add tests for chain expressions 2015-09-11 00:53:01 +02:00
Marcus Klaas
749a9689be Break chains that don't start with path expressions 2015-09-11 00:52:57 +02:00
Marcus Klaas
a53be86710 address mini offset bug in rewrite_match 2015-09-11 00:52:20 +02:00
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