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
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
Seiichi Uchida
ec32c961d3
Add a test for #3040
2018-09-21 00:57:46 +09:00
Seiichi Uchida
8021b29405
Add a test for #3006
2018-09-19 22:33:25 +09:00
Nick Cameron
829dbfabe9
Merge pull request #3028 from scampi/issue2973
...
Fix indent computation of a macro with braces.
2018-09-19 11:31:28 +12:00
Nick Cameron
1739041f03
Merge pull request #3002 from lqd/normalize-doc-attributes
...
normalize_doc_attributes option: convert doc attributes to comments
2018-09-19 11:05:27 +12:00
Nick Cameron
2267c2cddc
Merge pull request #3001 from scampi/issue2977
...
propagate errors about failing to rewrite a macro
2018-09-19 10:43:21 +12:00
Seiichi Uchida
661bea71c1
Merge pull request #3013 from YaLTeR/fix-issue-2985
...
Fix wrong shape for last chain items for indent_style = "Visual"
2018-09-18 20:21:21 +09:00
Nick Cameron
01c14a2058
Merge pull request #3012 from YaLTeR/fix-issue-2496
...
Fix match arm block flattening
2018-09-18 21:12:12 +12:00
Stéphane Campinas
c3edf6d3a1
Fix indent computation of a macro with braces.
...
The leading whitespace of a multine string was taken into account when
computing the `min_prefix_space_width`, even if that line couldn't be
trimmed. The consequence is it was always shifting the macro's content
to the right.
2018-09-18 00:01:51 +02:00
Rémy Rakic
0c73b9414b
add test ensuring only doc = "" attributes are normalized to comments
...
The other shapes of doc attributes shouldn't be normalized or modified.
2018-09-13 02:40:24 +02:00
Rémy Rakic
cbc58410d9
add tests interleaving doc attrib comments and regular comments
2018-09-13 02:27:09 +02:00
Rémy Rakic
171e656f64
add non-regression test to existing attributes
...
when `normalize_doc_attributes` is on, they shouldn't be affected
2018-09-13 01:10:57 +02:00
Rémy Rakic
4af0888648
add non-regression test to existing doc attributes
...
when `normalize_doc_attributes` is off, they shouldn't be normalized to a doc comment
2018-09-13 01:06:02 +02:00
Rémy Rakic
43f813867c
add test with multiple levels of indents
2018-09-13 01:02:11 +02:00
Nick Cameron
e39bd35ae1
Merge pull request #3010 from topecongiro/issue-3009
...
Refactor the corner case of handling long function
2018-09-12 13:55:41 +12:00
Ivan Molodetskikh
2f03a31e1a
Add a visual fn type alias test
2018-09-11 12:34:21 +03:00
Ivan Molodetskikh
abcdc0fadd
Add a test for #2985
2018-09-11 11:09:31 +03:00
Ivan Molodetskikh
f116baeed7
Add a test for match flattening
2018-09-11 08:54:43 +03:00
Ivan Molodetskikh
bc03234e25
Add a test for #2496
2018-09-11 08:54:43 +03:00
Seiichi Uchida
9674e12a5c
Add a test for #3009
2018-09-11 13:30:36 +09:00
Nick Cameron
77824a24ef
Merge pull request #2988 from YaLTeR/fix-issue-2922
...
Use correct indent in rewrite_bare_fn with Visual style
2018-09-11 15:50:13 +12:00
lqd
4b7130dfa1
normalize_doc_attributes option: convert doc attributes to comments
...
Convert `#![doc]` and `#[doc]` attributes to `//!` and `///` doc comments.
2018-09-07 21:58:35 +02:00
Stéphane Campinas
6f318e3cef
propagate errors about failing to rewrite a macro
2018-09-07 14:48:52 +02:00
Nick Cameron
f655671e12
Merge pull request #2983 from topecongiro/issue-2642
...
Handle raw string literals in CharClasses
2018-09-04 19:11:49 +12:00
Nick Cameron
a67208f212
Merge pull request #2986 from topecongiro/issue-2907
...
Handle chain w/ try operators with spaces
2018-09-03 13:10:50 +12:00
Ivan Molodetskikh
430f848c75
Add a test for #2922
2018-08-31 16:25:01 +03:00
Ivan Molodetskikh
098a5391f0
Add a test for #2930
2018-08-31 15:25:08 +03:00
Seiichi Uchida
1b8f0ff1b6
Add a test for #2907
2018-08-31 18:10:47 +09:00
Ryan Leckey
eec74360dc
Accept 2015 and 2018 instead of Edition2015 and Edition2018 for edition option
2018-08-31 00:04:23 -07:00
topecongiro
67480422b9
Handle raw string literal without any sharps
2018-08-31 10:49:39 +09:00
topecongiro
c903119d8d
Add a test for #2642
2018-08-31 10:37:22 +09:00
Seiichi Uchida
d8301050a5
Add a test for #2956
2018-08-30 23:38:40 +09:00
crw5996
d832525809
Merge branch 'master' of https://github.com/rust-lang-nursery/rustfmt into fix-use-bug
2018-08-27 23:04:55 -04:00
crw5996
20075306f7
Fixed Issues brought up in PR
2018-08-27 22:59:44 -04:00
crw5996
3585706fa2
Merge branch 'master' of https://github.com/rust-lang-nursery/rustfmt into fix-optional-arg-condensing
2018-08-27 13:44:56 -04:00
Seiichi Uchida
e1069403ca
Add a test for #2969
2018-08-27 16:12:11 +09:00
Nick Cameron
97d29ff2e1
Merge pull request #2942 from crw5996/fix-ellipsis-bug
...
Fix Issue with ellipsis matching in pattern.rs
2018-08-27 09:44:28 +12:00
Zach Lute
ca19c9a35a
Fix build with rust nightly by updating try block syntax. ( #2965 )
2018-08-26 13:02:24 +09:00
Maximilian Roos
10512a59d0
Impl only use ( #2951 )
2018-08-24 14:39:05 +09:00
chris
4e748a269e
Fixed ellipsis bug where rustfmt was creating code that could not be parsed
2018-08-24 00:58:21 -04:00
cad97
04d804c365
Rename CodeMap/FileMap to SourceMap/SourceFile
...
#2946
2018-08-23 17:10:46 -04:00
Nick Cameron
8573df602a
Merge pull request #2925 from scampi/issue539
...
discard trailing blank comments
2018-08-23 10:13:56 +12:00
Seiichi Uchida
dfe4eef8fc
Remove an invalid attribute from a test
...
This has become a parser error.
2018-08-19 00:26:56 +09:00
Stéphane Campinas
f23e6aaaf9
fix the identification of a block comment.
...
Block comments like below were not properly supported:
/*
something here but it doesn't start with a star
*/
because of the line that didn't start with a star.
2018-08-16 19:55:15 +02:00
Seiichi Uchida
71dc033fca
Add a test for #2919
2018-08-16 07:49:50 +09:00
Seiichi Uchida
996dbbf960
Add a test for slice patterns
2018-08-12 23:55:34 +09:00
Nick Cameron
66d3924aa8
Merge pull request #2899 from topecongiro/chain-with-comments
...
Format chains with comment
2018-08-07 15:07:23 +12:00
Nick Cameron
e4d560b914
Merge pull request #2897 from topecongiro/issue-2896
...
Ignore comment in wrap_str
2018-08-06 19:36:03 +12:00