Commit graph

4880 commits

Author SHA1 Message Date
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
Sinh Pham
55fe34a00f Format strings option https://github.com/nrc/rustfmt/issues/202 2015-09-01 08:14:52 -04:00
Nick Cameron
6216dce14e Support where clause predicates at different indentations 2015-09-01 19:04:41 +12:00
Nick Cameron
02a01350ff Support where predicates on the same line 2015-09-01 18:53:16 +12:00
Nick Cameron
6f3c329500 Support non-indented where clauses 2015-09-01 18:38:12 +12:00
Nick Cameron
fc2fb8be43 Support different indent styles for generics 2015-09-01 18:20:17 +12:00
Nick Cameron
0413c47a09 Support different tabbing of function args
(Although, frankly anything other than visual is deeply wrong).
2015-09-01 17:22:00 +12:00
Nick Cameron
89cda8d43a Option to pack fn args on fewer lines 2015-09-01 17:06:41 +12:00
Nick Cameron
3a165a30c1 Merge pull request #237 from posix4e/readme
rejiggered the readme file
2015-09-01 16:35:55 +12:00
Alex HotShot Newman
b1565c5c4c Readme cleanup 2015-08-31 21:02:19 -07:00
Nick Cameron
a0055e89c8 Merge pull request #236 from nrc/comments-test
Add a test module to comments
2015-09-01 15:43:37 +12:00
Nick Cameron
4b3262f514 Add a test module to comments 2015-09-01 15:39:37 +12:00
Nick Cameron
71d24e91e3 Merge pull request #232 from marcusklaas/boxes
Fix bad offset, underflow issues
2015-09-01 07:22:46 +12:00
Marcus Klaas
0f4bf9b3ba Fix some potential arithmetic underflow issues
There have been many of this sort already. These were just bugs waiting to happen.
2015-08-31 19:30:00 +02:00
Marcus Klaas
a896d91ff6 Fix offset for unary operations
Fixes https://github.com/nrc/rustfmt/issues/227.
2015-08-31 19:15:40 +02:00
Marcus Klaas de Vries
2bf4d74832 Merge pull request #230 from jdm/underflow
Avoid an integer underflow panic. Fixes #229.
2015-08-31 07:43:31 +02:00
Josh Matthews
6cf74956b3 Avoid an integer underflow panic. Fixes #229. 2015-08-30 23:15:14 -04:00
Nick Cameron
3b40c6a38c Merge pull request #221 from marcusklaas/diff-context
Refactor diff handling in tests
2015-08-31 11:03:39 +12:00
Marcus Klaas
adeafb3e45 Refactor diff handling in tests
This splits the generation and display of mismatches. Mismatches now include a few lines of context. Finally, diffs are now coloured.
2015-08-30 22:31:26 +02:00
cassiersg
b59ab9c13f Merge pull request #214 from crumblingstatue/clean_exit
Only exit after running all destructors and flushing stdout
2015-08-29 10:36:50 +02:00
Mika Attila
1f974fca01 Simplify match expression 2015-08-28 23:51:26 +02:00
cassiersg
c6001b72b1 Merge pull request #218 from cassiersg/empty_file
Add unittest for #115
2015-08-28 23:03:14 +02:00