use Shape;
use rewrite::{Rewrite, RewriteContext};
-use utils::{wrap_str, first_line_width};
+use utils::{wrap_str, first_line_width, last_line_width};
use expr::rewrite_call;
use config::BlockIndentStyle;
use macros::convert_try_mac;
// brace.
(parent_shape, false)
} else if parent_rewrite.contains('\n') {
- (chain_indent(context, parent_shape.block_indent(context.config.tab_spaces)), false)
+ (chain_indent(context,
+ parent_shape.block_indent(context.config.tab_spaces)),
+ false)
} else {
- (chain_indent_newline(context, shape.add_offset(parent_rewrite.len())), false)
+ (shape.block_indent(context.config.tab_spaces), false)
};
- let max_width = try_opt!((shape.width + shape.indent.width() + shape.offset).checked_sub(nested_shape.indent.width() + nested_shape.offset));
- // The alignement in the shape is only used if we start the item on a new
- // line, so we don't need to preserve the offset.
- let child_shape = Shape { width: max_width, ..nested_shape };
- debug!("child_shape {:?}", child_shape);
- let mut rewrites = try_opt!(subexpr_list.iter()
- .rev()
- .map(|e| rewrite_chain_subexpr(e, total_span, context, child_shape))
- .collect::<Option<Vec<_>>>());
+ let max_width = try_opt!((shape.width + shape.indent.width() + shape.offset)
+ .checked_sub(nested_shape.indent.width() +
+ nested_shape.offset));
+
+ let other_child_shape = Shape { width: max_width, ..nested_shape };
+ let first_child_shape = if extend {
+ let mut shape = try_opt!(parent_shape.shrink_left(last_line_width(&parent_rewrite)));
+ match context.config.chain_indent {
+ BlockIndentStyle::Visual => other_child_shape,
+ BlockIndentStyle::Tabbed => {
+ shape.offset = shape.offset.checked_sub(context.config.tab_spaces).unwrap_or(0);
+ shape.indent.block_indent += context.config.tab_spaces;
+ shape
+ }
+ }
+ } else {
+ other_child_shape
+ };
+ debug!("child_shapes {:?} {:?}",
+ first_child_shape,
+ other_child_shape);
+
+ let child_shape_iter =
+ Some(first_child_shape).into_iter().chain(::std::iter::repeat(other_child_shape)
+ .take(subexpr_list.len() - 1));
+ let iter = subexpr_list.iter().rev().zip(child_shape_iter);
+ let mut rewrites =
+ try_opt!(iter.map(|(e, shape)| rewrite_chain_subexpr(e, total_span, context, shape))
+ .collect::<Option<Vec<_>>>());
// Total of all items excluding the last.
- let almost_total = rewrites[..rewrites.len() - 1]
- .iter()
- .fold(0, |a, b| a + first_line_width(b)) + parent_rewrite.len();
+ let almost_total = rewrites[..rewrites.len() - 1].iter().fold(0, |a, b| {
+ a + first_line_width(b)
+ }) + parent_rewrite.len();
- let veto_single_line = if context.config.take_source_hints && subexpr_list.len() > 1 {
+ let veto_single_line = if subexpr_list.len() > context.config.chain_one_line_max - 1 {
+ // -1 above because subexpr_list does not include the parent.
+ true
+ } else if context.config.take_source_hints && subexpr_list.len() > 1 {
// Look at the source code. Unless all chain elements start on the same
// line, we won't consider putting them on a single line either.
let last_span = context.snippet(mk_sp(subexpr_list[1].span.hi, total_span.hi));
// True if the chain is only `?`s.
fn chain_only_try(exprs: &[ast::Expr]) -> bool {
exprs.iter().all(|e| if let ast::ExprKind::Try(_) = e.node {
- true
- } else {
- false
- })
+ true
+ } else {
+ false
+ })
}
pub fn rewrite_try(expr: &ast::Expr,
fn chain_indent(context: &RewriteContext, shape: Shape) -> Shape {
match context.config.chain_indent {
- BlockIndentStyle::Visual => shape,
- BlockIndentStyle::Inherit => shape.block_indent(0),
+ BlockIndentStyle::Visual => shape.visual_indent(0),
BlockIndentStyle::Tabbed => shape.block_indent(context.config.tab_spaces),
}
}
-// Ignores visual indenting because this function should be called where it is
-// not possible to use visual indentation because we are starting on a newline.
-fn chain_indent_newline(context: &RewriteContext, shape: Shape) -> Shape {
- match context.config.chain_indent {
- BlockIndentStyle::Inherit => shape.block_indent(0),
- BlockIndentStyle::Visual | BlockIndentStyle::Tabbed => {
- shape.block_indent(context.config.tab_spaces)
- }
- }
-}
-
fn rewrite_method_call_with_overflow(expr_kind: &ast::ExprKind,
last: &mut String,
almost_total: usize,
let (lo, type_str) = if types.is_empty() {
(args[0].span.hi, String::new())
} else {
- let type_list: Vec<_> = try_opt!(types.iter()
- .map(|ty| ty.rewrite(context, shape))
- .collect());
+ let type_list: Vec<_> =
+ try_opt!(types.iter().map(|ty| ty.rewrite(context, shape)).collect());
let type_str = if context.config.spaces_within_angle_brackets && type_list.len() > 0 {
format!("::< {} >", type_list.join(", "))
format!("::<{}>", type_list.join(", "))
};
- (types.last().unwrap().span.hi, type_str)
+ (types.last()
+ .unwrap()
+ .span
+ .hi,
+ type_str)
};
let callee_str = format!(".{}{}", method_name, type_str);
projects / rust.git / blobdiff