Commit Graph

4004 Commits

Author SHA1 Message Date
Nick Cameron
832a912f79
Merge pull request #3077 from YaLTeR/fix-extra-commas
Get rid of extra commas in Visual struct literal formatting
2018-10-08 14:37:48 +13:00
Nick Cameron
4dc5557625
Merge pull request #3070 from topecongiro/issue-3030
Format a paren expr with double slash comment
2018-10-08 13:05:36 +13:00
Nick Cameron
80d744973f
Merge pull request #3069 from topecongiro/issue-3003
Consider a multi-lined array as a block-like expression
2018-10-08 13:04:45 +13:00
Nick Cameron
d0c6a6d642
Merge pull request #3067 from topecongiro/refactor-toexpr
Add println!-like heuristic to the fail attribute
2018-10-08 12:38:33 +13:00
Nick Cameron
b32cf4aad8
Merge pull request #3063 from otavio/add-doc-is_doc_comment
comment: Add documentation to `is_doc_comment` public method
2018-10-08 10:41:18 +13:00
Seiichi Uchida
cab5ea3ed3
Merge pull request #3079 from topecongiro/rustc-ap
Cargo update
2018-10-07 07:37:44 +09:00
Seiichi Uchida
003fc730e6 Fix empty types being inserted to closure
cc https://github.com/rust-lang/rust/pull/54229.
2018-10-07 00:52:06 +09:00
Seiichi Uchida
5a6822c326 Cargo update 2018-10-07 00:39:49 +09:00
Ivan Molodetskikh
cbaed838d5
No trailing comma in struct literals (Visual) 2018-10-06 10:59:47 +03:00
Ivan Molodetskikh
cfe20fe585
Add a test for #3066 2018-10-06 10:59:47 +03:00
Seiichi Uchida
383a23d0ee
Merge pull request #3073 from scampi/format_strings
format_strings: take into account newline occurring within a rewritten line
2018-10-02 10:29:37 +09:00
Stéphane Campinas
4b26723e55
format_strings: take into account newline occurring within a rewritten line 2018-10-02 00:41:56 +02:00
Seiichi Uchida
70c8e366a6 Format a paren expr with double slash comment 2018-10-01 00:07:18 +09:00
Seiichi Uchida
efe24bd7e7 Add a test for #3030 2018-10-01 00:06:37 +09:00
Seiichi Uchida
30048222f2 Consider a multi-lined array as a block-like expression 2018-09-30 23:28:14 +09:00
Seiichi Uchida
4a15875f07 Add a test for #3003
and run cargo fmt.
2018-09-30 23:28:03 +09:00
Seiichi Uchida
bc835b71fd Update .travis.yml 2018-09-30 09:10:52 +09:00
Seiichi Uchida
6e901c8f37 Format and update test 2018-09-30 08:05:45 +09:00
Seiichi Uchida
d7e1f0006a Put arguments of the fail attribute on the same line as println! 2018-09-30 08:05:45 +09:00
Seiichi Uchida
052ba6c5df Move maybe_get_args_offset to overflow.rs 2018-09-30 08:05:45 +09:00
Seiichi Uchida
63387824b3 Avoid using to_expr as much as possible 2018-09-30 08:05:45 +09:00
Seiichi Uchida
c302409f56 Get rid of ToExpr trait 2018-09-30 08:05:35 +09:00
Seiichi Uchida
755d27a424 Take impl Iterator for overflow routines 2018-09-29 14:33:00 +09:00
Otavio Salvador
301ddd39db comment: Add documentation to is_doc_comment public method
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-09-28 10:01:07 -03:00
Nick Cameron
4c1b0c2241
Merge pull request #3061 from mehcode/feature/default-edition
Fix help message for edition config option
2018-09-28 21:54:29 +12:00
Nick Cameron
3dc6eed601
Merge pull request #2816 from moxian/enum-discrim
Add option to vertically align enum discriminants.
2018-09-28 21:48:57 +12:00
Ryan Leckey
c7377c3555 Fix help message for edition config option 2018-09-27 22:31:17 -07:00
Seiichi Uchida
86fff9eafa
Merge pull request #3050 from andrehjr/empty-impl-body-with-braces-newline
Trait Implementation - Adds a newline before the last brace on impls without a body if the first brace is also on a newline
2018-09-28 11:10:58 +09:00
Seiichi Uchida
333c580090
Merge pull request #3052 from scampi/contributing
added a note about the use of the RUST_LOG environment variable
2018-09-28 11:08:51 +09:00
Stéphane Campinas
2bcc3a9302 do not format a code block in documentation if it is annotated with ignore or text (#3058) 2018-09-28 11:06:29 +09:00
Stéphane Campinas
d681d5f456
added a note about the use of the RUST_LOG environment variable 2018-09-26 22:42:59 +02:00
moxian
65ae0b9a09 Change enum align semantics to care about absolute length, rather than difference.
If we're only aligning enum discriminants that are "not too far apart
(length-wise)", then this works really well for enums with
consistently-long or consistently-short idents, but not for the mixed
ones.
However, consistently-long idents is somewhate of an uncommon case and
overlong idents may be allowed to be formatted suboptimally if that
makes mixed-length idents work better (and it does in this case).
2018-09-26 18:47:17 +00:00
moxian
cc22869fb4 Add option to vertically align enum discriminants. 2018-09-26 14:35:38 +00:00
André Luis Leal Cardoso Junior
2727d41ddb Makes brace behavior consistent with empty bodies for traits and impls
Adds a newline before the last brace on impls without a body if the first brace is also on a newline
2018-09-26 09:44:13 -03:00
Nick Cameron
90692a5917 Update rustc_ap_syntax 2018-09-26 08:55:15 +12:00
Nick Cameron
88f3b32e43 Remove unnecessary feature flag 2018-09-25 18:23:17 +12:00
Nick Cameron
ac6871f376
Merge pull request #3048 from emilio/merged-comments
lists: Detect block comment by starting from the end.
2018-09-24 14:22:01 +12:00
Nick Cameron
1e60c6118e
Merge pull request #3045 from scampi/issue2917
Prevent right-shifting of block comments with bare lines.
2018-09-24 14:11:46 +12:00
Nick Cameron
ff4fe5db13
Merge pull request #3044 from orium/fix-too-many-modsep
Fix bug in import where two consecutive module separators were possible.
2018-09-24 14:07:20 +12:00
Emilio Cobos Álvarez
66c15e46ba
lists: Detect block comment by starting from the end.
The issue with the current code is that comments are collapsed, so comments like
the one from the test end up in a string like:

```
"// this is a single line comment\n/* block = */"
```

I chose to fix it by detecting whether we're in a block comment starting from
the end instead, and tested a single-line comment ended in `*/` just for sanity,
ensuring line breaks are not removed in that case, which would break the
formatting.

The right fix eventually is probably to lex the comments properly, but this does
the work for now, I guess :)

Fixes #3025
2018-09-22 12:16:38 +02:00
Stéphane Campinas
5fdb6db136
Prevent right-shifting of block comments with bare lines.
Lines that didn't start with a comment sigil were returned unchanged in
comment::rewrite_comment. Then these unchanged lines were indented in
MacroBranch::rewrite.
2018-09-22 00:09:11 +02:00
Diogo Sousa
98a0ef2436 Fix bug in import where two consecutive module separators were possible.
Fixes #3043.
2018-09-21 18:51:19 +01:00
Nick Cameron
4568c1a70f
Merge pull request #3042 from topecongiro/issue-3040
Do not trim a block from expression if its condition will go multi-line
2018-09-21 14:25:21 +12:00
Seiichi Uchida
f70d139f9c Do not trim a block from expression if its condition will go multi-line 2018-09-21 00:58:47 +09:00
Seiichi Uchida
ec32c961d3 Add a test for #3040 2018-09-21 00:57:46 +09:00
Nick Cameron
cd8549e013
Merge pull request #3036 from topecongiro/issue-2932
Combine chain items only when the item gets orphaned otherwise
2018-09-20 11:36:46 +12:00
Nick Cameron
635efdf69b
Merge pull request #3035 from topecongiro/issue-3006
Format generics on associated types
2018-09-20 11:33:47 +12:00
Seiichi Uchida
e2b9c66cc9 Cargo fmt 2018-09-19 23:22:26 +09:00
Seiichi Uchida
d4f7e219dc Fix shape for index 2018-09-19 23:21:07 +09:00
Seiichi Uchida
76650174c7 Combine chain items only when the item will get orphaned 2018-09-19 23:20:43 +09:00