Commit Graph

510 Commits

Author SHA1 Message Date
Marcus Klaas de Vries
dfa8ae4048 Merge pull request #464 from marcusklaas/semicolonz
Force semicolons after break/continue/return. Remove after blocks.
2015-10-15 21:03:38 +02:00
Marcus Klaas de Vries
5ac3be2c11 Merge pull request #469 from marcusklaas/rustup300
Adjust for unified enum variants and structs
2015-10-15 20:50:33 +02:00
Marcus Klaas
5ca9381d74 Adjust for unified enum variants and structs 2015-10-15 20:37:36 +02:00
Marcus Klaas
b039e3a8c3 Force semicolons after break/continue/return. Remove after blocks. 2015-10-15 19:55:42 +02:00
Nick Cameron
f04358e398 Merge pull request #461 from marcusklaas/hard-tab-chains
Indent uncontinued chains to block level
2015-10-15 08:40:01 +13:00
Marcus Klaas
dba08bf898 Indent uncontinued chains to block level 2015-10-14 19:41:29 +02:00
Nick Cameron
1acce558be Merge pull request #453 from gsvolt/issue353
Issue353
2015-10-13 20:16:43 +13:00
Gaurav Saxena
7f1fbea8e9 added semicolons for return statements 2015-10-13 02:22:35 -04:00
Gaurav Saxena
af00f3ffe6 added semicolons to break statements 2015-10-13 02:17:51 -04:00
Nick Cameron
c23dca3925 Merge pull request #449 from marcusklaas/array-block-indent
Use visual block indentation for array literals
2015-10-13 12:11:05 +13:00
Marcus Klaas
e6af5d2c83 Use visual block indentation for array literals 2015-10-12 21:14:12 +02:00
Marcus Klaas de Vries
4bc43f6f35 Merge pull request #443 from marcusklaas/variadic-fns
Format variadic arguments
2015-10-11 21:01:10 +02:00
Marcus Klaas
b768d27f03 Format variadic arguments 2015-10-11 20:57:44 +02:00
Nick Cameron
47483866c6 Merge pull request #437 from iwillspeak/master
Fix Build to Compile with 1.5.0-nightly (87cd2c082)
2015-10-11 08:16:44 +13:00
Will Speak
a5081c9832 Fix Build to Compile with 1.5.0-nightly (87cd2c082)
There was an extra, unused, paramter int he match arm which causes an
error when compiling with the latest nightly.
2015-10-10 19:02:25 +01:00
Nick Cameron
25abebf576 Merge pull request #432 from nrc/long-tuple
Handle multi-line return types and multi-line tuples
2015-10-10 14:58:33 +13:00
Nick Cameron
aed558fce4 Handle multi-line return types and multi-line tuples
Closes #409
2015-10-10 14:55:31 +13:00
Nick Cameron
e9ea76983c Merge pull request #433 from sinhpham/fix_430
Fix https://github.com/nrc/rustfmt/issues/430
2015-10-09 18:51:58 +13:00
Sinh Pham
f075fd01ab Fix https://github.com/nrc/rustfmt/issues/430 2015-10-08 22:49:16 -07:00
Nick Cameron
3ca8d3677a Merge pull request #429 from marcusklaas/method-calls2
Try "overflowing" the final function argument when it's a closure
2015-10-09 12:27:37 +13:00
Marcus Klaas
ccd404ac6f Try "overflowing" the final function argument when it's a closure
This means that we try formatting the last argument of a function call with block
indentation instead of visual indentation when it is a closure and its first line
fits on the same line as the first arguments.
2015-10-08 23:40:33 +02:00
Marcus Klaas de Vries
e7a6795509 Merge pull request #420 from mwiczer/Issue270
Fix https://github.com/nrc/rustfmt/issues/270
2015-10-08 23:38:04 +02:00
mwiczer
5162282b60 Support pre- and post-comments for enums
Use lists to format enum variants rather than special formatting.
Add tests for enums mostly around block comments.
2015-10-08 17:22:57 -04:00
Nick Cameron
9209e1cd1e Merge pull request #428 from marcusklaas/macro-fewer-panix
Prevent panics on list-like macro uses with trailing commas
2015-10-09 09:46:01 +13:00
Marcus Klaas
8daf4c3a31 Prevent panics on list-like macro uses with trailing commas 2015-10-08 22:04:17 +02:00
Marcus Klaas de Vries
915f27f177 Merge pull request #423 from nrc/atrib_bug
Format inner and outer attributes separately.
2015-10-08 19:51:30 +02:00
cassiersg
0860633e40 Merge pull request #427 from steveklabnik/cargo_style
Use newer style in Cargo.toml
2015-10-08 17:22:07 +02:00
Steve Klabnik
67e5c28fd9 Use newer style in Cargo.toml
This keeps everything under dependencies, which is nice.
2015-10-08 11:09:54 -04:00
cassiersg
b6db26e1d2 Merge pull request #425 from jonas-schievink/patch-1
Fix typos in config descriptions
2015-10-08 16:20:15 +02:00
Jonas Schievink
e68cd08935 Fix typos in config descriptions 2015-10-08 16:13:10 +02:00
Nick Cameron
6600cd341a Format inner and outer attributes separately.
Actually just skips inner attributes, because its a pain to track them, and lets missed spans handle them.

Closes #413
2015-10-08 17:20:19 +13:00
cassiersg
8880c0e5d3 Merge pull request #416 from SingingTree/windows_tests
Fix path issue with tests on Windows
2015-10-07 15:50:12 +02:00
Bryce Van Dyk
8be1d1926e Fix path issue with tests on Windows
The code that manipulates paths to try and find files in the target dir
was not handling windows file seperators correctly. The code has been
updated to use the path module, and hopefully will play nicer across
operating systems.
2015-10-08 01:10:07 +13:00
Marcus Klaas de Vries
5eeae3944e Merge pull request #404 from marcusklaas/rewrite-list-fmt
List formatting refactoring
2015-10-06 22:29:52 +02:00
Marcus Klaas
199d40fa55 Increase default function call width limit 2015-10-06 22:27:11 +02:00
Marcus Klaas de Vries
7ea589d7b4 Merge pull request #403 from marcusklaas/casts
Format casts, indices and repeated elements
2015-10-05 19:26:14 +02:00
Marcus Klaas
a76df6b4d9 Make listItem contain option 2015-10-04 20:40:14 +02:00
Marcus Klaas
965ea09664 Split ListTactic decision logic from write_list 2015-10-04 20:40:14 +02:00
Marcus Klaas de Vries
251af6e161 Merge pull request #398 from sezna/master
Fix https://github.com/nrc/rustfmt/issues/389
2015-10-02 21:15:10 +02:00
Alex
c726bcae80 infinite while loop fixed, redundancy removed 2015-10-02 11:13:07 -05:00
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
d0be26b383 Unify pair formatting code 2015-10-02 12:25:22 +02:00
Marcus Klaas
ca0b860688 Format repeated element array literals 2015-10-02 12:00:28 +02:00
Marcus Klaas
84718b5b90 Format rustfmt's own indices 2015-10-02 11:48:52 +02:00
Marcus Klaas
ad2e3b8e2b Format indices 2015-10-02 11:47:03 +02:00
Marcus Klaas
603f2034a5 Format type casts 2015-10-02 11:31:40 +02:00
Marcus Klaas de Vries
fff0be2f82 Merge pull request #402 from tikue/master
Fix 1-tuple regression.
2015-10-02 08:44:21 +02:00
Marcus Klaas de Vries
63860bb777 Merge pull request #378 from sinhpham/fix_376
Fix https://github.com/nrc/rustfmt/issues/376
2015-10-02 08:42:43 +02:00
Tim Kuehn
6c6e7194c2 Fix 1-tuple regression.
Add test to prevent future regressions.
2015-10-01 11:06:49 -07:00
Sinh Pham
11ed3c81d5 Fix https://github.com/nrc/rustfmt/issues/376 2015-09-30 23:43:56 -04:00