Stéphane Campinas
a4e97fa17b
compute the span after a struct-like item based on the ident description
2018-11-13 21:10:30 +01:00
Nick Cameron
34333bad20
Merge pull request #3189 from scampi/issue3032
...
fix logic for adding or not a newline after a missed span
2018-11-12 09:56:35 +13:00
Stéphane Campinas
d121d7205f
fix logic for adding or not a newline after a missed span
2018-11-09 20:50:07 +01:00
Nick Cameron
4e2f741917
Merge pull request #3175 from kestred/kstenerson/delimited-overflow
...
Add config option to more aggressively allow overflow
2018-11-09 15:46:23 +13:00
Kevin Stenerson
3330e6717e
Add tests that include comments before the overflow-able params
2018-11-08 19:38:01 -07:00
Kevin Stenerson
97843377ee
Replace always true conditionals with true
2018-11-08 19:26:12 -07:00
Nick Cameron
6efc963245
Merge pull request #3188 from scampi/issue3124
...
do not add a newline after a missed span if it is the end of a block comment
2018-11-09 15:26:05 +13:00
Nick Cameron
c4cc479fcd
Merge pull request #3183 from scampi/issue3182
...
do not wrap comments in doctest to avoid failing doctest runs
2018-11-09 15:14:44 +13:00
Stéphane Campinas
f570438e75
do not add a newline after a missed span if it is the end of a block comment
2018-11-08 22:44:59 +01:00
Seiichi Uchida
9534dfc062
Cargo update ( #3186 )
...
Update `rustc-ap-*` crates to 290.0.0.
2018-11-08 23:16:13 +09:00
Alan Du
3986e690d1
Do not count /*/ as both start and end comment ( #3185 )
2018-11-08 14:28:08 +09:00
Seiichi Uchida
f10b2256a0
Merge pull request #3181 from scampi/issue3131
...
fix the logic for retaining a comment before the arrow in a match
2018-11-08 14:15:09 +09:00
Nick Cameron
e4652fb271
0.99.7
2018-11-08 09:24:46 +13:00
Stéphane Campinas
a5043a81be
do not wrap comments in doctest to avoid failing doctest runs
2018-11-07 16:48:39 +01:00
Stéphane Campinas
9467033a8e
fix the logic for retaining a comment before the arrow in a match
2018-11-07 15:00:33 +01:00
Kevin Stenerson
cd8bb50aea
Trim the indentation on macros which heuristically appear to use block-style indentation ( #3178 )
2018-11-07 17:49:53 +09:00
Kevin Stenerson
7290529b3f
Add docs to Configuration guide
2018-11-05 21:50:54 -07:00
Kevin Stenerson
25b828d35f
Add config option to more aggressively allow overflow
2018-11-05 21:12:40 -07:00
Nick Cameron
16d5f507b6
Merge pull request #3172 from scampi/issue3153
...
trim the start of a line when wrapping an item in preparation for formatting
2018-11-06 10:23:30 +13:00
Nick Cameron
bd29e16d16
Merge pull request #3171 from lqd/whitespace_jam
...
normalize_doc_attributes: remove whitespace from the doc comment opener
2018-11-06 10:12:35 +13:00
Stéphane Campinas
5a2ebdddcc
trim the start of a line when wrapping an item in preparation for formatting
2018-11-05 20:22:06 +01:00
Rémy Rakic
83d1d9aa14
normalize_doc_attributes: remove leading whitespace from the doc comment opener
...
Remove possible whitespace from the `CommentStyle::opener()` so that the literal itself has control over the comment's leading spaces.
This is most useful for tools, such as bindgen, to allow for example: machine-readable comments with precise syntax rules, or idempotently round-tripping between the proc-macro API and rustfmt.
2018-11-05 18:24:36 +01:00
Nick Cameron
2a34414b47
Merge pull request #3165 from scampi/alignment
...
fix alignment of a struct's fields with the visual style
2018-11-05 12:59:54 +13:00
Stéphane Campinas
7132fe03a0
fix alignment of a struct's fields with the visual style
...
- rewrite_with_alignment was called from the expr module with the wrong
shape that missed the extra offset needed for the visual style
- rewrite_with_alignment was indenting the given shape although that
should have been the caller's responsability
2018-11-04 23:41:21 +01:00
Nick Cameron
b8a133d432
Merge pull request #3145 from otavio/allow-failure-for-crater
...
CI: only run unit tests for `crater`
2018-11-02 10:08:39 +13:00
Otavio Salvador
c4dd45060d
Travis CI: Move futures-rs
out from allow-failures
...
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-11-01 17:56:54 -03:00
Otavio Salvador
693a2fc23a
CI: Rework integration script so only lib unit tests are run for crater
...
Refs: https://github.com/rust-lang-nursery/crater/issues/358
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-11-01 16:48:21 -03:00
Nick Cameron
8506f5e5ce
Merge pull request #3159 from scampi/issue-3132
...
The method trim_left_preserve_layout didn't handle tabs properly.
2018-10-31 14:33:11 +13:00
Nick Cameron
2c471a559f
Merge pull request #3152 from topecongiro/do-not-override-edition-in-rustfmt-toml
...
Use edition in rustfmt.toml when no command line argument is passed
2018-10-31 13:31:24 +13:00
Stéphane Campinas
2d718a3fc2
The method trim_left_preserve_layout didn't handle tabs properly.
...
This is fixed by taking the method macros::indent_macro_snippet which
essentially does the same: it indents a paragraph while preserving the
layout.
2018-10-30 20:24:03 +01:00
Seiichi Uchida
b2706ebecc
Merge pull request #3155 from emilio/missed-spans-bug
...
missed-spans: Fix bogus check.
2018-10-30 15:26:53 +09:00
Emilio Cobos Álvarez
4a82252f03
missed-spans: Fix bogus check.
...
I don't really know what it's trying to do, but forgetting about everything
you've seen before when you see whitespace followed by a semicolon doesn't look
right to me, and absolutely no tests were hitting that.
This check was introduced in 5ecdd072d6
, however
it was wrong even at that point, and now rustfmt still passes that test,
regardless of macro name.
Fixes #3154 .
2018-10-30 03:21:28 +01:00
Seiichi Uchida
7bf0d308f8
Merge pull request #3150 from flip1995/patch-1
...
Remove deprecated cfg_attr from README
2018-10-29 23:01:51 +09:00
Seiichi Uchida
6fa804deba
Use edition in rustfmt.toml when no command line argument is passed
2018-10-29 22:53:29 +09:00
Philipp Krones
9adf96d961
Remove deprecated cfg_attr from README
...
`tool_attributes` are stable since 1.30. The old `cfg_attr(rustfmt, rustfmt_skip)` attributes aren't necessary anymore and everyone should switch to `#[rustfmt::skip]` sooner or later.
There is also a Clippy lint in the making for this: rust-lang-nursery/rust-clippy#3123
2018-10-29 10:27:19 +01:00
Nick Cameron
1f64f4012f
Merge pull request #3141 from dfyz/issue-2810
...
Try to fix formatting failures on Windows (issue #2810 )
2018-10-29 11:29:51 +13:00
Nick Cameron
bdd40493ca
Merge pull request #3144 from otavio/issues-3143
...
cargo-fmt: Fix splitting of targets across editions
2018-10-29 11:22:05 +13:00
Nick Cameron
42780f0b39
Merge pull request #3142 from topecongiro/issue-3139
...
Do not remove path disambiugator inside macro
2018-10-29 11:08:38 +13:00
Ivan Komarov
00a20bceff
Fix formatting failures on Windows
...
When newline_style is set to Windows, an empty line inside of a macro
results in `\r` being passed to the `fold()` in `MacroBranch::rewrite()`.
`\r` is technically not an empty string, so we try to indent it, leaving
trailing whitespaces behind, even though that was not intended
(as far as I can see).
This commit replaces the `!l.is_empty()` check with calling
`is_empty_line()`, since trying to indent any whitespace-only string
will probably result in problematic trailing whitespaces.
Fixes : #2810
2018-10-28 02:37:55 +03:00
Otavio Salvador
12275f2e6a
cargo-fmt: Fix splitting of targets across editions
...
When I reworked the code, it ended not generating the complete list of
need targets. Fix it.
Fixes : #3143 .
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-27 16:13:22 -03:00
Otavio Salvador
3efca8a596
cargo-fmt: Add --edition when printing the command
...
By mistake, it was forgotten to print out the edition in use when
printing the rustcmd command. Fix it.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-27 11:49:48 -03:00
Seiichi Uchida
5ca90edc5b
Do not remove path disambiugator inside macro
2018-10-27 11:22:40 +09:00
Seiichi Uchida
131f11a6e5
Add a test for #3139
2018-10-27 11:22:18 +09:00
Nick Cameron
8fb1b179bf
Merge pull request #3140 from matthiaskrgr/redundant_clones
...
fix clippy::redundant_clones warnings.
2018-10-27 12:29:59 +13:00
Matthias Krüger
68638508d4
fix clippy::redundant_clones warnings.
2018-10-26 14:45:25 +02:00
Nick Cameron
593ac525ae
Merge pull request #3138 from topecongiro/issue-3137
...
Simplify handling of parens around generic bound trait
2018-10-26 21:26:26 +13:00
Seiichi Uchida
7093bbe2ff
Simplify handling parens on generic bound trait
2018-10-26 16:39:35 +09:00
Seiichi Uchida
2d0487164f
Add a test for #3137
2018-10-26 16:36:01 +09:00
Nick Cameron
284583fade
Merge pull request #3134 from otavio/issue-3104
...
Stabilize `edition` configuration option
2018-10-25 15:03:59 +13:00
Otavio Salvador
9c3ae2d951
Stabilize edition
configuration option
...
Refs: #3104 .
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-24 22:49:17 -03:00