Commit Graph

2919 Commits

Author SHA1 Message Date
topecongiro
5e0c6f9716 Avoid orphan in chain with punctuation 2018-02-06 09:36:29 +09:00
Seiichi Uchida
d85e1db178
Merge pull request #2393 from RReverser/macro_rules
Format stable macro_rules
2018-02-05 09:56:26 +09:00
topecongiro
18ba02ea70 Add a test for #2208
Closes #2208.
2018-02-05 08:38:53 +09:00
Nick Cameron
c4314df1ab
Merge pull request #2412 from topecongiro/issue-2399
Do not reorder items with '#[macro_use]'
2018-02-05 11:28:58 +13:00
Nick Cameron
c45c20378f
Merge pull request #2413 from topecongiro/issue-2401
Use correct offset when unindenting code block
2018-02-05 08:44:21 +13:00
Ingvar Stepanyan
8691c64e99 cargo run cargo-fmt
Reformat codebase with current version to pass self_tests (formats macros without repetitions).
2018-02-04 12:09:03 +00:00
Ingvar Stepanyan
d8c154f052 Extract branch rewrite function 2018-02-04 11:55:08 +00:00
Ingvar Stepanyan
571af9d4b1 Format 2018-02-04 11:54:03 +00:00
Ingvar Stepanyan
bc9185451d Move ; between macro branches to a separator 2018-02-04 11:54:03 +00:00
Ingvar Stepanyan
6377c52233 Fix comment handling in macros 2018-02-04 11:54:03 +00:00
Ingvar Stepanyan
70e7716262 Comments WIP 2018-02-04 11:54:03 +00:00
Ingvar Stepanyan
41c393c751 Keep delimiter as part of macro args list 2018-02-04 11:53:10 +00:00
Ingvar Stepanyan
fef3e03d3e Add repetition example 2018-02-04 11:53:10 +00:00
Ingvar Stepanyan
9423cdba82 Omit newline for empty macro branches 2018-02-04 11:53:10 +00:00
Ingvar Stepanyan
5bd036fcac Optimise common => {{ macro pattern 2018-02-04 11:53:10 +00:00
Ingvar Stepanyan
9fca9073d9 Revert comments 2018-02-04 11:53:10 +00:00
Ingvar Stepanyan
1b9fd01343 Support compact macros 2.0 representation 2018-02-04 11:53:10 +00:00
Ingvar Stepanyan
9318b4d2cf Update some macro tests 2018-02-04 11:53:10 +00:00
Ingvar Stepanyan
c750442e04 Add macro_rules tests 2018-02-04 11:53:09 +00:00
Ingvar Stepanyan
5d973d2e8c Initial support for macros 1.1 2018-02-04 11:53:09 +00:00
Seiichi Uchida
f815858420 Use correct offset when unindenting code block
When using hard tabs, we should only remove '\t'.
2018-02-04 17:21:10 +09:00
Nick Cameron
526367ace2
Merge pull request #2411 from topecongiro/update-travis
Update a minimal travis example
2018-02-04 16:58:21 +13:00
Seiichi Uchida
3bb0a2a749 Do not reorder items with '#[macro_use]'
Reordering items with `#[macro_use]` could change the semantic of source code.
There could exist other attributes that requires special treatment.
2018-02-04 12:08:02 +09:00
Seiichi Uchida
9273a72420 Add tests for reorder_extern_crates 2018-02-04 12:07:51 +09:00
Seiichi Uchida
0910883cf2 Update a minimal travis example 2018-02-04 11:27:31 +09:00
Nick Cameron
346238f497
Merge pull request #2410 from topecongiro/skip-repeat-macro
Skip rewriting macro def with repeat
2018-02-04 14:33:03 +13:00
Nick Cameron
ca09746ce9
Merge pull request #2406 from nrc/str-fix
Make `is_mod_decl` more accommodating
2018-02-04 14:18:34 +13:00
Seiichi Uchida
61b23a4293 Skip rewriting macro def with repeat 2018-02-04 08:52:50 +09:00
Nick Cameron
30a28a262c Make is_mod_decl more accommodating
Fixes #2403 (I think)
2018-02-02 15:16:29 +13:00
Nick Cameron
7c3a422742 Update libsyntax crates 2018-02-02 14:18:30 +13:00
Nick Cameron
2a71bef0b0 0.3.7 2018-02-01 19:25:48 +13:00
Nick Cameron
0294a79b5b
Merge pull request #2384 from topecongiro/init-shorthand
Use field initialization shorthand if possible
2018-02-01 15:20:11 +13:00
Nick Cameron
b7f01769f9
Merge branch 'master' into init-shorthand 2018-02-01 15:20:01 +13:00
Nick Cameron
918e79bb5a
Merge pull request #2380 from topecongiro/reorder-mods
[RFC] Reorder modules alphabetically
2018-02-01 15:18:34 +13:00
Seiichi Uchida
2fb6bd3b9f
Merge pull request #2400 from csmoe/support_immovable_generators
Support immovable generators
2018-01-31 13:13:05 +09:00
csmoe
28bb16a5a0 add a support for immovable generators 2018-01-30 22:14:33 +08:00
Seiichi Uchida
c9c346a89f Add 'use_field_init_shorthand' config option 2018-01-29 22:15:20 +09:00
Seiichi Uchida
4c9ab8b405 Cargo fmt with modules reordering enabled 2018-01-29 22:00:07 +09:00
Seiichi Uchida
56c6d73d82 Reorder modules
Add `reorder_modules` config option.

Two things we must keep in mind when reordering modules:
1. We should not reorder modules with attributes, as doing so could
   potentially break the code (e.g. `#[macro_use]`).
2. We should not reorder inline modules e.g. `mod foo { /* .. */ }`.
   We should only reorder module declarations e.g. `mod foo;`.

Some open questions:
1. Should we bring modules with `pub` in front of those without `pub`
   so that they stand out from others?
2. Instead of keeping modules with attributes in the same place,
   can we bring them in front of others? Is this safe?
2018-01-29 21:59:15 +09:00
Seiichi Uchida
7d63490d85 Update to the latest libsyntax changes 2018-01-29 21:44:26 +09:00
Seiichi Uchida
5977f516b1 Cargo update 2018-01-29 21:43:44 +09:00
Nick Cameron
ba3dec2379
Merge pull request #2395 from davidalber/fix-configuration-snippets2
Fixing straightforward configuration snippets (Part 2)
2018-01-29 13:51:16 +11:00
Nick Cameron
4633786848
Merge pull request #2396 from topecongiro/issue-2389
Put attributes and enum variants on different lines
2018-01-29 10:36:26 +11:00
Seiichi Uchida
c60d865b98 Put attributes and enum variants on different lines 2018-01-26 16:20:00 +09:00
Seiichi Uchida
dfc67a5df7 Cargo clippy 2018-01-26 14:53:28 +09:00
David Alber
476ec77fa3 Wrapping match_arm_blocks=false snippet in function 2018-01-25 21:05:19 -08:00
David Alber
42efa7cc2f Wrapping match_arm_blocks=true snippet in function 2018-01-25 21:05:19 -08:00
David Alber
d27393528c Fixing use_try_shorthand=true snippet 2018-01-25 21:05:19 -08:00
David Alber
90c3ea716a Fixing use_try_shorthand=false snippet 2018-01-25 21:05:19 -08:00
David Alber
4315e3d968 Fixing type_punctuation_density=Compressed snippet 2018-01-25 21:05:19 -08:00