Commit graph

4046 commits

Author SHA1 Message Date
Seiichi Uchida
476992a15d Add a test for #3092 2018-10-14 21:47:50 +09:00
Seiichi Uchida
c4a8cdcdf1
Merge pull request #3095 from otavio/avoid-overflow-control-flow-expr
Avoid control flow expressions conditions to go multi line
2018-10-14 21:03:27 +09:00
Seiichi Uchida
8dfdca9390
Merge pull request #3094 from otavio/avoid-unwrap-or
Replace `.unwrap_or` with `.map_or` in few places
2018-10-14 21:02:39 +09:00
Otavio Salvador
ef59b34cd7 Avoid control flow expressions conditions to go multi line
Extends the multi line condition to over other control flow
expressions, it now covers: `if`, `if let`, `for`, `loop`, `while`,
`while let` and `match`.

Refs: #3029

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-13 14:12:43 -03:00
Seiichi Uchida
a0d1f171dc
Merge pull request #3090 from otavio/issue-3029
Only combine `match` if its condition expression fits in a single line
2018-10-13 10:36:31 +09:00
Otavio Salvador
6d7fef078e bin: replace .unwrap_or with .map_or
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-12 20:22:10 -03:00
Otavio Salvador
5d4ed07f1c config: replace .unwrap_or with .map_or
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-12 20:21:48 -03:00
Otavio Salvador
2e9a97a84d expr: replace .unwrap_or with .map_or
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-12 20:21:22 -03:00
Otavio Salvador
8feeddf1f8 Only combine match if its condition expression fits in a single line
This improves the formatting and reading of code avoiding the
condition expression to be rewrite, if it goes multi line.

Fixes: #3029.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-12 20:12:45 -03:00
Otavio Salvador
b144adf3be closures: replace .unwrap_or with .map_or
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-12 20:07:25 -03:00
Nick Cameron
8b709c0019 Add attr_fn_like_width to the width heuristics
It is a bit larger than than `fn_call_width` which we used previously, so fewer attributes get reformatted.

Closes #2929
2018-10-12 15:20:42 +13:00
Nick Cameron
b82949b36e
Merge pull request #3089 from topecongiro/format-comment
Add format_doc_comments
2018-10-12 09:55:45 +12:00
Nick Cameron
d74947c65e
Merge pull request #3086 from otavio/bump-rustc-ap-272
Update rustc-ap-* to 272.0.0
2018-10-12 09:45:33 +12:00
Seiichi Uchida
b2de574848 Add format_doc_comments 2018-10-11 23:34:36 +09:00
Seiichi Uchida
0f6607bb8a
Merge pull request #3088 from otavio/fix-misleading-comment
rewrite: adjust comment as it refers to `is_if_else_block`
2018-10-11 22:52:17 +09:00
Otavio Salvador
6391b7ab35 rewrite: adjust comment as it refers to is_if_else_block
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-11 10:37:15 -03:00
Seiichi Uchida
15717be9c5
Merge pull request #3087 from scampi/lineoverflow
fixed display message for the LineOverflow error
2018-10-11 17:36:39 +09:00
Stéphane Campinas
7003276b73
fixed display message for the LineOverflow error 2018-10-11 09:05:33 +02:00
Otavio Salvador
0abc02fbfa Update rustc-ap-* to 272.0.0
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-10 21:53:25 -03:00
Nick Cameron
3c9ec96094
Merge pull request #3084 from otavio/issue-1990
Enable `stdin_disable_all_formatting_test` test
2018-10-10 10:40:18 +12:00
Nick Cameron
4895699e88
Merge pull request #3083 from scampi/itemized_blocks
Handle itemized blocks in comments
2018-10-10 10:38:54 +12:00
Stéphane Campinas
375c87820f
rewrite_string: detect when a url is being split and place the new line
after it
2018-10-09 21:47:32 +02:00
Seiichi Uchida
839c4946e2
Merge pull request #3085 from otavio/extend-gitignore
.gitignore: Ignore Emacs backup files
2018-10-09 22:49:33 +09:00
Otavio Salvador
2ae1b4804c Enable stdin_disable_all_formatting_test test
Fixes: #1990.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-09 09:06:16 -03:00
Otavio Salvador
6a1b768f49 .gitignore: Ignore Emacs backup files
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-09 05:26:27 -03:00
Stéphane Campinas
c0b7222e2d
handle itemized items inside comments 2018-10-09 00:44:59 +02:00
Nick Cameron
2f25ae7e57
Merge pull request #3082 from otavio/bump-dependencies
Bump dependencies
2018-10-09 08:01:25 +12:00
Nick Cameron
ceac4838e1
Merge pull request #3080 from topecongiro/issue-3031
Format macro calls with item-like arguments
2018-10-09 08:00:45 +12:00
Otavio Salvador
0f3cc703fd Bump rustc-ap-* to 270.0.0
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-08 14:42:54 -03:00
Otavio Salvador
0279b7d02c Replace isatty crate with atty
The `isatty` crate has been deprecated and a replacement has been
released for it called `atty`. It offers a nicer API and the code
change to adapt is trivial.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-10-08 14:39:16 -03:00
Stéphane Campinas
8b3788d875
rewrite_string: allow to break on a boundary character that is on edge 2018-10-08 14:48:15 +02:00
Stéphane Campinas
bb7442802a
rewrite_string: retain blank lines that are trailing 2018-10-08 14:48:15 +02:00
Stéphane Campinas
1c6a2e3de8
rewrite_string: take care of blank lines appearing within the last line 2018-10-08 14:48:14 +02:00
Stéphane Campinas
3205e17cc3
rewrite_string: handle newlines in the last line that fits in the shape for cases where line_start is not a whitespace 2018-10-08 14:48:14 +02:00
Stéphane Campinas
2fc1de6b4a
rewrite_string: do not overflow the next line when the line_start is not a whitespace 2018-10-08 14:48:13 +02:00
Stéphane Campinas
f46082fbd8
rewrite_string: trim trailing whitespace in case the last_line fits in the given shape 2018-10-08 14:48:13 +02:00
Seiichi Uchida
70177a08a4 Format a macro call with multile item-like arguments 2018-10-08 13:52:26 +09:00
Seiichi Uchida
baa20dfcf1 Format a macro call with a single item-like argument 2018-10-08 13:50:03 +09:00
Seiichi Uchida
a925bdf092 Add a test for #3031 and update test
No combining for an item-like macro argument.
2018-10-08 13:50:00 +09:00
Nick Cameron
1b2e72726f
Merge pull request #3078 from YaLTeR/fix-closure-indentation
Fix inconsistent overflow behavior in Visual style
2018-10-08 14:38:49 +13:00
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
dee68434e6
Overflow Visual functions even with one argument 2018-10-06 16:32:38 +03:00
Ivan Molodetskikh
6dc9b96651
Add a test for #3049 2018-10-06 16:32:27 +03:00