Commit graph

877 commits

Author SHA1 Message Date
Nick Cameron
397449b292 Merge pull request #668 from marcusklaas/regression-tests
Regression tests
2015-12-07 08:10:06 +13:00
Nick Cameron
f569144bbf Merge pull request #666 from marcusklaas/matches-5000
Break function headers earlier
2015-12-07 08:07:23 +13:00
Nick Cameron
26297c56df Merge pull request #615 from JanLikar/version
Add --version switch
2015-12-07 07:32:16 +13:00
Marcus Klaas
97e4e7e5ba Fixed named arguments in bare function types 2015-12-06 01:11:26 +01:00
Marcus Klaas de Vries
22353ca8c7 Merge pull request #674 from Ms2ger/start
Use starts_with to avoid panics.
2015-12-04 16:37:59 +01:00
Marcus Klaas de Vries
80d1552ec0 Merge pull request #673 from Manishearth/clippy
Minor clippy fixes r? @nrc
2015-12-04 16:37:32 +01:00
Ms2ger
1ed36a3a6b Use starts_with to avoid panics. 2015-12-04 16:10:14 +01:00
Manish Goregaokar
f61ba91c2d Minor clippy fixes 2015-12-04 18:02:19 +05:30
Marcus Klaas
ea6ce22a16 Add regression test for overlong trait methods 2015-12-02 21:08:09 +01:00
Marcus Klaas
9734bd05af Add regression test for backslash stripping 2015-12-02 21:03:41 +01:00
Marcus Klaas de Vries
34737529db Merge pull request #667 from Marwes/alias_where
Fix missed edgecases in formatting of type aliases
2015-12-02 20:45:01 +01:00
Markus Westerlind
a6b0d475f4 Don't remove where clauses in type aliases 2015-12-02 20:11:17 +01:00
Markus Westerlind
ae9ad7b288 Fix formatting of type aliases where '=' is at or close to the max width 2015-12-02 20:11:10 +01:00
Marcus Klaas de Vries
e677f05805 Merge pull request #659 from Marwes/where_clause
Fix where clauses not taking the width of the line into account
2015-12-02 19:06:24 +01:00
Marcus Klaas de Vries
0c5de26ef2 Merge pull request #663 from SingingTree/match_trailing_comma
WIP: Trailing commas for match block arms
2015-12-02 19:05:04 +01:00
Bryce Van Dyk
74d40c042f Update block checking code 2015-12-02 16:44:40 +13:00
Marcus Klaas
76f303f369 Break function headers earlier
Closes rustfmt#295.
2015-12-01 22:09:37 +01:00
Markus Westerlind
17fd2d073b Add a BraceStyle parameter to rewrite_where_clause
This allow it to exactly calculate if it needs to break the where clause into multiple lines
2015-12-01 19:51:49 +01:00
Bryce Van Dyk
7ce887abcf Update trailing comma match logic, add tests
Updates the traling comma code to attempt to handle multiline non-block bodies when
adding traling commas to blocks. Also add and update tests to cover better
the interactions between trailing commas and wrapping match arms.
2015-12-01 20:10:57 +13:00
Marcus Klaas
0fb9611786 Don't include failed item rewrites in missed spans 2015-11-30 23:12:50 +01:00
Bryce Van Dyk
2a430a8947 Trailing commas for match block arms
Attempt to implement an option for trailing commas for block based match arms (issue
173). Put in place test files to verify this behaviour.
2015-11-30 21:51:20 +13:00
Markus Westerlind
052fddd4dd Use the BraceStyle config to calculate the width for braces in where clasues 2015-11-28 13:59:14 +01:00
Nick Cameron
36d65e4538 Merge pull request #662 from crumblingstatue/patch-1
Fix typo in README.md
2015-11-28 22:14:24 +13:00
Mika Attila
bf36369032 Fix typo in README.md
We conform to (i.e. comply with) the Rust Style Guidelines, not confirm their validity.
2015-11-28 10:03:46 +01:00
Nick Cameron
a2804dbd25 Merge pull request #660 from sanxiyn/unused-import
Remove unused imports
2015-11-28 10:03:03 +13:00
Seo Sanghyeon
17c8fb10ea Remove unused imports 2015-11-27 23:38:05 +09:00
Markus Westerlind
937467c358 Fix where clauses not taking the width of the line into account
Fixes #630
2015-11-27 09:27:41 +01:00
Nick Cameron
28922f37dd Merge pull request #640 from Marwes/alias
Format type aliases
2015-11-27 09:30:10 +13:00
Markus Westerlind
0021001a07 Use utils::last_line_width in rewrite_type_alias 2015-11-26 21:28:00 +01:00
Markus Westerlind
c61d6d4c3a Format type aliases
Fixes #486
2015-11-26 21:04:49 +01:00
Nick Cameron
68bc387925 Merge pull request #655 from kyeah/impl-comments
Keep comments in empty impl body
2015-11-26 17:59:22 +13:00
Kevin Yeh
314aff1a33 Reformat trim_newlines 2015-11-25 22:46:11 -06:00
Nick Cameron
6b1002da81 Merge pull request #658 from sanxiyn/clippy
Apply Clippy
2015-11-25 20:07:21 +13:00
Seo Sanghyeon
2b11d84119 Apply Clippy 2015-11-25 15:39:15 +09:00
Kevin Yeh
f5fac4c54f Fix empty trim_newline panic, add impl macro test 2015-11-24 14:37:31 -06:00
Kevin Yeh
c408245e5d Add impl newline tests 2015-11-24 13:02:55 -06:00
Kevin Yeh
b6dc8a3f76 Keep comments in empty impl bodies 2015-11-24 12:55:32 -06:00
Marcus Klaas de Vries
7483c2a8f9 Merge pull request #642 from rust-lang-nursery/impl
Implement formatting of impls
2015-11-23 22:09:28 +01:00
Nick Cameron
d405fdc236 Fix a bug with nested impls 2015-11-24 09:37:52 +13:00
Marcus Klaas de Vries
5a3f5bc1f6 Merge pull request #646 from rust-lang-nursery/mulit-file
Handle multiply-referenced files
2015-11-23 21:35:09 +01:00
Nick Cameron
ebd876afb2 Merge pull request #649 from jaxx/dependency-upd1
update dependencies and fix compile errors
2015-11-24 08:08:35 +13:00
Jakko Sikkar
411fa40988 update dependencies and fix compile errors 2015-11-23 20:54:33 +02:00
Nick Cameron
2661592d59 Handle multiply-referenced files
Fixes #645
2015-11-23 15:22:00 +13:00
Nick Cameron
40eb3ea857 Merge pull request #641 from marcusklaas/fix-doc-commentz
Correct doc comment indentation for struct fields
2015-11-23 13:58:19 +13:00
Nick Cameron
e3f39941de Types which can be return types for function types
Fixes #643
2015-11-23 13:55:53 +13:00
Nick Cameron
e86872c95b tests 2015-11-23 13:09:00 +13:00
Nick Cameron
b577f95e3c Reformatting due to changes 2015-11-23 13:09:00 +13:00
Nick Cameron
9cf8529e33 Implement formatting for impls
Fixes #614
2015-11-23 13:09:00 +13:00
Marcus Klaas
4b4dd170d8 Correct doc comment indentation for struct fields
Fix https://github.com/rust-lang-nursery/rustfmt/issues/572.
2015-11-22 22:55:57 +01:00
Marcus Klaas de Vries
08e6e74e69 Merge pull request #639 from rust-lang-nursery/mod-skip
Take rustfmt_skip attribute into account on modules
2015-11-22 22:16:31 +01:00