diff --git a/src/expr.rs b/src/expr.rs index 8bef270cf763..4eaf52681add 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -1871,7 +1871,9 @@ fn rewrite_pat_expr( } else { format!("{} ", matcher) }; - let pat_shape = shape.offset_left(matcher.len())?.sub_width(connector.len())?; + let pat_shape = shape + .offset_left(matcher.len())? + .sub_width(connector.len())?; let pat_string = pat.rewrite(context, pat_shape)?; let result = format!("{}{}{}", matcher, pat_string, connector); return rewrite_assign_rhs(context, result, expr, shape); diff --git a/src/items.rs b/src/items.rs index be22db49fbf1..e2a07194f2bc 100644 --- a/src/items.rs +++ b/src/items.rs @@ -2037,9 +2037,7 @@ fn rewrite_args( generics_str_contains_newline: bool, ) -> Option { let mut arg_item_strs = args.iter() - .map(|arg| { - arg.rewrite(context, Shape::legacy(multi_line_budget, arg_indent)) - }) + .map(|arg| arg.rewrite(context, Shape::legacy(multi_line_budget, arg_indent))) .collect::>>()?; // Account for sugary self. @@ -2713,17 +2711,15 @@ impl Rewrite for ast::ForeignItem { let span = mk_sp(self.span.lo(), self.span.hi() - BytePos(1)); let item_str = match self.node { - ast::ForeignItemKind::Fn(ref fn_decl, ref generics) => { - rewrite_fn_base( - context, - shape.indent, - self.ident, - &FnSig::new(fn_decl, generics, self.vis.clone()), - span, - false, - false, - ).map(|(s, _)| format!("{};", s)) - } + ast::ForeignItemKind::Fn(ref fn_decl, ref generics) => rewrite_fn_base( + context, + shape.indent, + self.ident, + &FnSig::new(fn_decl, generics, self.vis.clone()), + span, + false, + false, + ).map(|(s, _)| format!("{};", s)), ast::ForeignItemKind::Static(ref ty, is_mutable) => { // FIXME(#21): we're dropping potential comments in between the // function keywords here. diff --git a/src/string.rs b/src/string.rs index c072d3186a20..9812b8af6110 100644 --- a/src/string.rs +++ b/src/string.rs @@ -67,7 +67,9 @@ pub fn rewrite_string<'a>(orig: &str, fmt: &StringFormat<'a>) -> Option let ender_length = fmt.line_end.len(); // If we cannot put at least a single character per line, the rewrite won't // succeed. - let max_chars = shape.width.checked_sub(fmt.opener.len() + ender_length + 1)? + 1; + let max_chars = shape + .width + .checked_sub(fmt.opener.len() + ender_length + 1)? + 1; // Snip a line at a time from `orig` until it is used up. Push the snippet // onto result.