nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-07 14:13:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Verify whether adding block is safe in rewrite_closure_with_block()

Browse Source 
Also ensure that the expression is nested to avoid false-positive.
This commit is contained in:
Seiichi Uchida 2017-12-10 21:27:28 +09:00
parent 4110c7b8c5
commit 5871967312
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/closures.rs
View File

@ -118,6 +118,12 @@ fn rewrite_closure_with_block(
context: &RewriteContext,
shape: Shape,
) -> Option<String> {
let left_most = left_most_sub_expr(body);
let veto_block = left_most != body && !classify::expr_requires_semi_to_be_stmt(left_most);
if veto_block {
return None;
}
let block = ast::Block {
stmts: vec![
ast::Stmt {
@ -142,9 +148,6 @@ fn rewrite_closure_expr(
shape: Shape,
) -> Option<String> {
let mut rewrite = expr.rewrite(context, shape);
if classify::expr_requires_semi_to_be_stmt(left_most_sub_expr(expr)) {
rewrite = and_one_line(rewrite);
}
rewrite = rewrite.and_then(|rw| {
if context.config.force_multiline_blocks() && rw.contains('\n') {
None