nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-02 19:53:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add and remove comments

Browse Source
This commit is contained in:
topecongiro 2017-06-16 08:28:12 +09:00
parent 0d5768964b
commit e7240f5e24
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/expr.rs
View File

@ -590,6 +590,7 @@ fn rewrite_closure_fn_decl(
};
let list_str = try_opt!(write_list(&item_vec, &fmt));
let mut prefix = format!("{}|{}|", mover, list_str);
// 1 = space between `|...|` and body.
let extra_offset = extra_offset(&prefix, shape) + 1;
if !ret_str.is_empty() {
@ -682,6 +683,7 @@ fn rewrite_closure(
}
}
// Rewrite closure with a single expression wrapping its body with block.
fn rewrite_closure_with_block(
context: &RewriteContext,
shape: Shape,
@ -703,6 +705,7 @@ fn rewrite_closure_with_block(
rewrite_closure_block(&block, prefix, context, shape)
}
// Rewrite closure with a single expression without wrapping its body with block.
fn rewrite_closure_expr(
expr: &ast::Expr,
prefix: &str,
@ -716,6 +719,7 @@ fn rewrite_closure_expr(
rewrite.map(|rw| format!("{} {}", prefix, rw))
}
// Rewrite closure whose body is block.
fn rewrite_closure_block(
block: &ast::Block,
prefix: &str,
@ -2217,24 +2221,29 @@ where
// When overflowing the closure which consists of a single control flow expression,
// force to use block if its condition uses multi line.
ast::ExprKind::Closure(capture, ref fn_decl, ref body, _) => {
if rewrite_cond(context, body, shape).map_or(false, |cond| cond.contains('\n')) {
rewrite_closure_fn_decl(capture, fn_decl, body, expr.span, context, shape)
.and_then(|(prefix, extra_offset)| {
// 1 = space between `|...|` and body.
shape.offset_left(extra_offset).and_then(|body_shape| {
let body = match body.node {
ast::ExprKind::Block(ref block) => {
stmt_expr(&block.stmts[0]).unwrap()
}
_ => body,
};
rewrite_closure_with_block(context, body_shape, &prefix, body)
})
})
.or_else(|| expr.rewrite(context, shape))
} else {
expr.rewrite(context, shape)
}
let try_closure_with_block = || {
let body = match body.node {
ast::ExprKind::Block(ref block) if block.stmts.len() == 1 => {
try_opt!(stmt_expr(&block.stmts[0]))
}
_ => body,
};
let (prefix, extra_offset) = try_opt!(rewrite_closure_fn_decl(
capture,
fn_decl,
body,
expr.span,
context,
shape,
));
let shape = try_opt!(shape.offset_left(extra_offset));
rewrite_cond(context, body, shape).map_or(None, |cond| if cond.contains('\n') {
rewrite_closure_with_block(context, shape, &prefix, body)
} else {
None
})
};
try_closure_with_block().or_else(|| expr.rewrite(context, shape))
}
_ => expr.rewrite(context, shape),
}

5
tests/target/issue-1681.rs
View File

@ -1,7 +1,9 @@
// rustfmt-max_width: 80
// We would like to surround closure body with block when overflowing the last
// argument of function call if the last argument has condition and without
// block it may go multi lines.
fn foo() {
// This is where it gets good
refmut_map_result(self.cache.borrow_mut(), |cache| {
match cache.entry(cache_key) {
Occupied(entry) => Ok(entry.into_mut()),
@ -13,7 +15,6 @@ fn foo() {
Ok(entry.insert(try!(statement)))
}
// and now, casually call a method on this
}
}).map(MaybeCached::Cached)
}