Commit graph

459 commits

Author SHA1 Message Date
sezna
2f7acf00e5 Added punctuation preference
Create test.rs

Delete test.rs

Fixed compile error.

Trying a possible fix on an arithmetic overflow

another try at the test failure...

passed all tests.

Added tests and cleaned up logic as per nrc's critiques

Delete string.rs.old

Delete string.rs.bk

Made changes as per nrc's requests.

Update string_punctuation.rs

Update string_punctuation.rs

fixed logical redundancy
2015-10-02 08:37:21 -05:00
Marcus Klaas de Vries
9ab2d95119 Merge pull request #396 from scyptnex/refactor-configuration
Refactoring configuration
2015-09-29 07:49:46 +02:00
Scyptnex
00b314618d Refactoring configuration 2015-09-29 09:38:19 +10:00
Marcus Klaas de Vries
10eb21d020 Merge pull request #384 from nrc/where-empty
Option for putting the where clause on the same line as the function …
2015-09-28 19:43:25 +02:00
Nick Cameron
d7efdd60c8 Merge pull request #387 from marcusklaas/prevent-overflow
Prevent arithmetic overflow handling match arm comments
2015-09-28 09:27:44 +13:00
Marcus Klaas
30aefa6dc7 Prevent arithmetic overflow handling match arm comments 2015-09-27 22:11:17 +02:00
Nick Cameron
840af4f84d Option for putting the where clause on the same line as the function if the body is empty. 2015-09-28 08:46:05 +13:00
Nick Cameron
9139a8040c Merge pull request #379 from marcusklaas/enum-quik-fix
Fix variant name duplication on rewrite failure
2015-09-28 07:51:09 +13:00
Marcus Klaas de Vries
dcbea4611f Merge pull request #381 from marcusklaas/unchecked-sub
Remove a few unchecked subtractions, uses of ty_to_string
2015-09-27 18:11:16 +02:00
Marcus Klaas
431e8d9d2f Remove a few unchecked subtractions, uses of ty_to_string 2015-09-27 17:56:38 +02:00
Marcus Klaas
a673fef844 Fix variant name duplication on rewrite failure 2015-09-27 17:23:37 +02:00
Marcus Klaas de Vries
0f485aabd6 Merge pull request #374 from nrc/fix-fn
Use max width for function decls, not ideal width
2015-09-27 14:52:08 +02:00
Marcus Klaas de Vries
afee62e476 Merge pull request #370 from marcusklaas/match-arm-delining
Improve heuristics for match arm body placement
2015-09-27 12:00:57 +02:00
Marcus Klaas
2eb67827a7 Add extra tests for match arm placement 2015-09-27 11:58:26 +02:00
Nick Cameron
ba51535a74 Fixup tests 2015-09-27 19:39:58 +13:00
Nick Cameron
bc59f83f02 Use max width for function decls, etc.
We were using ideal width + leeway before. This means we can remove leeway from the config. We could remove ideal_width too, but I want to use it for comments.
2015-09-27 19:34:35 +13:00
Nick Cameron
224eecce50 Minor refactoring in compute_budgets_for_args 2015-09-27 19:25:04 +13:00
Nick Cameron
dad4626517 Merge pull request #368 from nrc/struct-wide
Use a width heuristic for struct lits
2015-09-27 10:50:50 +13:00
Marcus Klaas
2d4a0cbe3b Fix match arm indentation bug 2015-09-26 23:18:57 +02:00
Marcus Klaas
078fff068a Improve heuristics for match arm body placement 2015-09-26 22:35:53 +02:00
Marcus Klaas de Vries
fd057ab595 Merge pull request #367 from nrc/self-alias
Format imports with aliases.
2015-09-26 18:25:05 +02:00
Nick Cameron
e4c15b4e1c Fix tests 2015-09-26 18:35:17 +12:00
Nick Cameron
617eed353c Changes to rustfmt source 2015-09-26 18:29:48 +12:00
Nick Cameron
3a9e4f0540 add test 2015-09-26 18:27:51 +12:00
Nick Cameron
b894dd8abf Use a width heuristic for struct lits.
Closes #123
2015-09-26 18:25:41 +12:00
Nick Cameron
b2e7da0aa0 Format imports with aliases.
Closes #366
2015-09-26 18:12:25 +12:00
Nick Cameron
9a5688f7c2 Merge pull request #354 from nrc/max-fn
Use vertical formatting when function args width > limit
2015-09-26 14:05:22 +12:00
Nick Cameron
d161b8df72 rebasing changes and address review comment 2015-09-26 14:00:19 +12:00
Nick Cameron
8dfcb9bcdd Fix tests 2015-09-26 13:58:12 +12:00
Nick Cameron
99d71a164a Changes to source formatting 2015-09-26 13:58:12 +12:00
Nick Cameron
ebf64ca35d Heuristic max width for function calls 2015-09-26 13:54:22 +12:00
Nick Cameron
e161de0daa Merge pull request #352 from nrc/ty_parens_fix
Formatting of some types
2015-09-26 13:50:00 +12:00
Nick Cameron
92fbb80097 Formatting of some types
Closes #341
2015-09-26 13:48:02 +12:00
Nick Cameron
dcbfd0469f Merge pull request #362 from marcusklaas/rewrite-string
Make rewrite_string return `Option<String>`
2015-09-26 13:36:59 +12:00
Nick Cameron
415d9898ed Merge pull request #365 from marcusklaas/format-struct-panic
Use the maximum available width in struct formatting
2015-09-26 13:35:41 +12:00
Marcus Klaas
5db17ca703 Use the maximum available width in struct formatting
Previously, we'd use an approximation for the maximum width since the configuration wasn't available in `write_list`.
2015-09-25 16:56:22 +02:00
Marcus Klaas de Vries
4ccf420415 Merge pull request #363 from marcusklaas/rustup35
Adjust for changed representation of box expressions in AST
2015-09-25 13:28:09 +02:00
Marcus Klaas
bc0dd2c68d Adjust for changed representation of box expressions in AST 2015-09-25 13:25:52 +02:00
Marcus Klaas
a7690cb1e5 Make rewrite_string return Option<String> 2015-09-25 13:01:20 +02:00
Nick Cameron
e80080deb6 Merge pull request #359 from eefriedman/rewrite-addrof
Add support for formatting AddrOf (unary "&").
2015-09-24 20:30:54 +12:00
Eli Friedman
19e887c309 Add support for formatting AddrOf (unary "&"). 2015-09-24 01:13:57 -07:00
Nick Cameron
d941fe20b4 Merge pull request #358 from eefriedman/rewrite-return
Add support for formatting "return" expressions.
2015-09-24 18:19:37 +12:00
Eli Friedman
69da1a78de Add support for formatting "return" expressions.
Fixes #303.
2015-09-23 23:12:04 -07:00
Eli Friedman
ed597a8059 Exhaustively enumerate expressions in expression rewriting. 2015-09-23 22:51:37 -07:00
Nick Cameron
56d1a94b5f Merge pull request #357 from scyptnex/match-comma-retention
fix for #355 and test cases
2015-09-24 14:07:39 +12:00
Scyptnex
f1dfab5a29 fix for #355 and test cases 2015-09-24 12:01:48 +10:00
Nick Cameron
e176dc97fe Merge pull request #347 from scyptnex/issue339-match_block_collapse
match arms collapse for issue #339
2015-09-24 12:28:35 +12:00
Scyptnex
19d1ec1dec Fixes #339 and #272 2015-09-24 10:22:06 +10:00
Nick Cameron
c14cfca0e3 Merge pull request #349 from globin/rust-nightly-update
Adapt to rust sytax::ast::Mac changes
2015-09-24 07:10:15 +12:00
Robin Gloster
5e2633b742 adapt to rust sytax::ast::Mac changes 2015-09-23 18:31:31 +00:00