use chains::rewrite_chain;
use closures;
use codemap::{LineRangeUtils, SpanUtils};
-use comment::{combine_strs_with_missing_comments, contains_comment, recover_comment_removed,
- rewrite_comment, rewrite_missing_comment, CharClasses, FindUncommented};
+use comment::{
+ combine_strs_with_missing_comments, contains_comment, recover_comment_removed, rewrite_comment,
+ rewrite_missing_comment, CharClasses, FindUncommented,
+};
use config::{Config, ControlBraceStyle, IndentStyle};
-use lists::{definitive_tactic, itemize_list, shape_for_tactic, struct_lit_formatting,
- struct_lit_shape, struct_lit_tactic, write_list, ListFormatting, ListItem, Separator};
+use lists::{
+ definitive_tactic, itemize_list, shape_for_tactic, struct_lit_formatting, struct_lit_shape,
+ struct_lit_tactic, write_list, ListFormatting, ListItem, Separator,
+};
use macros::{rewrite_macro, MacroArg, MacroPosition};
use matches::rewrite_match;
use overflow;
use spanned::Spanned;
use string::{rewrite_string, StringFormat};
use types::{can_be_overflowed_type, rewrite_path, PathContext};
-use utils::{colon_spaces, contains_skip, count_newlines, first_line_width, inner_attributes,
- last_line_extendable, last_line_width, mk_sp, outer_attributes, paren_overhead,
- ptr_vec_to_ref_vec, semicolon_for_stmt, wrap_str};
+use utils::{
+ colon_spaces, contains_skip, count_newlines, first_line_width, inner_attributes,
+ last_line_extendable, last_line_width, mk_sp, outer_attributes, ptr_vec_to_ref_vec,
+ semicolon_for_stmt, wrap_str,
+};
use vertical::rewrite_with_alignment;
use visitor::FmtVisitor;
expr.span,
context,
shape,
- None,
+ choose_separator_tactic(context, expr.span),
None,
),
ast::ExprKind::Lit(ref l) => rewrite_literal(context, l, shape),
rewrite_call(context, &callee_str, args, inner_span, shape)
}
ast::ExprKind::Paren(ref subexpr) => rewrite_paren(context, subexpr, shape, expr.span),
- ast::ExprKind::Binary(ref op, ref lhs, ref rhs) => {
+ ast::ExprKind::Binary(op, ref lhs, ref rhs) => {
// FIXME: format comments between operands and operator
- rewrite_pair(
- &**lhs,
- &**rhs,
- PairParts::new("", &format!(" {} ", context.snippet(op.span)), ""),
- context,
- shape,
- context.config.binop_separator(),
- )
+ rewrite_simple_binaries(context, expr, shape, op).or_else(|| {
+ rewrite_pair(
+ &**lhs,
+ &**rhs,
+ PairParts::new("", &format!(" {} ", context.snippet(op.span)), ""),
+ context,
+ shape,
+ context.config.binop_separator(),
+ )
+ })
}
ast::ExprKind::Unary(ref op, ref subexpr) => rewrite_unary_op(context, op, subexpr, shape),
ast::ExprKind::Struct(ref path, ref fields, ref base) => rewrite_struct_lit(
| ast::ExprKind::While(..)
| ast::ExprKind::WhileLet(..) => to_control_flow(expr, expr_type)
.and_then(|control_flow| control_flow.rewrite(context, shape)),
- ast::ExprKind::Block(ref block) => {
+ // FIXME(topecongiro): Handle label on a block (#2722).
+ ast::ExprKind::Block(ref block, _) => {
match expr_type {
ExprType::Statement => {
if is_unsafe_block(block) {
ast::ExprKind::Index(ref expr, ref index) => {
rewrite_index(&**expr, &**index, context, shape)
}
- ast::ExprKind::Repeat(ref expr, ref repeats) => {
- let (lbr, rbr) = if context.config.spaces_within_parens_and_brackets() {
- ("[ ", " ]")
- } else {
- ("[", "]")
- };
- rewrite_pair(
- &**expr,
- &**repeats,
- PairParts::new(lbr, "; ", rbr),
- context,
- shape,
- SeparatorPlace::Back,
- )
- }
+ ast::ExprKind::Repeat(ref expr, ref repeats) => rewrite_pair(
+ &**expr,
+ &**repeats,
+ PairParts::new("[", "; ", "]"),
+ context,
+ shape,
+ SeparatorPlace::Back,
+ ),
ast::ExprKind::Range(ref lhs, ref rhs, limits) => {
let delim = match limits {
ast::RangeLimits::HalfOpen => "..",
rw
} else {
// 9 = `do catch `
- let budget = shape.width.checked_sub(9).unwrap_or(0);
+ let budget = shape.width.saturating_sub(9);
Some(format!(
"{}{}",
"do catch ",
})
}
+/// Collect operands that appears in the given binary operator in the opposite order.
+/// e.g. `collect_binary_items(e, ||)` for `a && b || c || d` returns `[d, c, a && b]`.
+fn collect_binary_items<'a>(mut expr: &'a ast::Expr, binop: ast::BinOp) -> Vec<&'a ast::Expr> {
+ let mut result = vec![];
+ let mut prev_lhs = None;
+ loop {
+ match expr.node {
+ ast::ExprKind::Binary(inner_binop, ref lhs, ref rhs)
+ if inner_binop.node == binop.node =>
+ {
+ result.push(&**rhs);
+ expr = lhs;
+ prev_lhs = Some(lhs);
+ }
+ _ => {
+ if let Some(lhs) = prev_lhs {
+ result.push(lhs);
+ }
+ break;
+ }
+ }
+ }
+ result
+}
+
+/// Rewrites a binary expression whose operands fits within a single line.
+fn rewrite_simple_binaries(
+ context: &RewriteContext,
+ expr: &ast::Expr,
+ shape: Shape,
+ op: ast::BinOp,
+) -> Option<String> {
+ let op_str = context.snippet(op.span);
+
+ // 2 = spaces around a binary operator.
+ let sep_overhead = op_str.len() + 2;
+ let nested_overhead = sep_overhead - 1;
+
+ let nested_shape = (match context.config.indent_style() {
+ IndentStyle::Visual => shape.visual_indent(0),
+ IndentStyle::Block => shape.block_indent(context.config.tab_spaces()),
+ }).with_max_width(context.config);
+ let nested_shape = match context.config.binop_separator() {
+ SeparatorPlace::Back => nested_shape.sub_width(nested_overhead)?,
+ SeparatorPlace::Front => nested_shape.offset_left(nested_overhead)?,
+ };
+
+ let opt_rewrites: Option<Vec<_>> = collect_binary_items(expr, op)
+ .iter()
+ .rev()
+ .map(|e| e.rewrite(context, nested_shape))
+ .collect();
+ if let Some(rewrites) = opt_rewrites {
+ if rewrites.iter().all(|e| ::utils::is_single_line(e)) {
+ let total_width = rewrites.iter().map(|s| s.len()).sum::<usize>()
+ + sep_overhead * (rewrites.len() - 1);
+
+ let sep_str = if total_width <= shape.width {
+ format!(" {} ", op_str)
+ } else {
+ let indent_str = nested_shape.indent.to_string_with_newline(context.config);
+ match context.config.binop_separator() {
+ SeparatorPlace::Back => format!(" {}{}", op_str.trim_right(), indent_str),
+ SeparatorPlace::Front => format!("{}{} ", indent_str, op_str.trim_left()),
+ }
+ };
+
+ return wrap_str(rewrites.join(&sep_str), context.config.max_width(), shape);
+ }
+ }
+
+ None
+}
+
#[derive(new, Clone, Copy)]
pub struct PairParts<'a> {
prefix: &'a str,
width: context.budget(lhs_overhead),
..shape
};
- let lhs_result = lhs.rewrite(context, lhs_shape)
+ let lhs_result = lhs
+ .rewrite(context, lhs_shape)
.map(|lhs_str| format!("{}{}", pp.prefix, lhs_str))?;
// Try to put both lhs and rhs on the same line.
.map(|first_line| first_line.ends_with('{'))
.unwrap_or(false);
if !rhs_result.contains('\n') || allow_same_line {
- let one_line_width = last_line_width(&lhs_result) + pp.infix.len()
- + first_line_width(rhs_result) + pp.suffix.len();
+ let one_line_width = last_line_width(&lhs_result)
+ + pp.infix.len()
+ + first_line_width(rhs_result)
+ + pp.suffix.len();
if one_line_width <= shape.width {
return Some(format!(
"{}{}{}{}",
let user_str = user_str.trim();
if user_str.starts_with('{') && user_str.ends_with('}') {
let comment_str = user_str[1..user_str.len() - 1].trim();
- if block.stmts.is_empty() && !comment_str.contains('\n') && !comment_str.starts_with("//")
+ if block.stmts.is_empty()
+ && !comment_str.contains('\n')
+ && !comment_str.starts_with("//")
&& comment_str.len() + 4 <= shape.width
{
return Some(format!("{}{{ {} }}", prefix, comment_str));
let else_block = self.else_block?;
let fixed_cost = self.keyword.len() + " { } else { }".len();
- if let ast::ExprKind::Block(ref else_node) = else_block.node {
+ if let ast::ExprKind::Block(ref else_node, _) = else_block.node {
if !is_simple_block(self.block, None, context.codemap)
|| !is_simple_block(else_node, None, context.codemap)
|| pat_expr_str.contains('\n')
let one_line_budget = context
.config
.max_width()
- .checked_sub(constr_shape.used_width() + offset + brace_overhead)
- .unwrap_or(0);
+ .saturating_sub(constr_shape.used_width() + offset + brace_overhead);
let force_newline_brace = (pat_expr_string.contains('\n')
|| pat_expr_string.len() > one_line_budget)
&& !last_line_extendable(&pat_expr_string);
// `for event in event`
// Do not include label in the span.
- let lo = self.label
+ let lo = self
+ .label
.map_or(self.span.lo(), |label| label.ident.span.hi());
let between_kwd_cond = mk_sp(
context
return Some(cond_str);
}
- let block_width = shape.width.checked_sub(used_width).unwrap_or(0);
+ let block_width = shape.width.saturating_sub(used_width);
// This is used only for the empty block case: `{}`. So, we use 1 if we know
// we should avoid the single line case.
let block_width = if self.else_block.is_some() || self.nested_if {
attrs: Option<&[ast::Attribute]>,
codemap: &CodeMap,
) -> bool {
- (block.stmts.len() == 1 && stmt_is_expr(&block.stmts[0])
- && !block_contains_comment(block, codemap) && attrs.map_or(true, |a| a.is_empty()))
+ (block.stmts.len() == 1
+ && stmt_is_expr(&block.stmts[0])
+ && !block_contains_comment(block, codemap)
+ && attrs.map_or(true, |a| a.is_empty()))
}
/// Checks whether a block contains at most one statement or expression, and no
attrs: Option<&[ast::Attribute]>,
codemap: &CodeMap,
) -> bool {
- block.stmts.len() <= 1 && !block_contains_comment(block, codemap)
+ block.stmts.len() <= 1
+ && !block_contains_comment(block, codemap)
&& attrs.map_or(true, |a| a.is_empty())
}
attrs: Option<&[ast::Attribute]>,
codemap: &CodeMap,
) -> bool {
- block.stmts.is_empty() && !block_contains_comment(block, codemap)
+ block.stmts.is_empty()
+ && !block_contains_comment(block, codemap)
&& attrs.map_or(true, |a| inner_attributes(a).is_empty())
}
pats: &[&ast::Pat],
shape: Shape,
) -> Option<String> {
- let pat_strs = pats.iter()
+ let pat_strs = pats
+ .iter()
.map(|p| p.rewrite(context, shape))
.collect::<Option<Vec<_>>>()?;
- let use_mixed_layout = pats.iter()
+ let use_mixed_layout = pats
+ .iter()
.zip(pat_strs.iter())
.all(|(pat, pat_str)| is_short_pattern(pat, pat_str));
let items: Vec<_> = pat_strs.into_iter().map(ListItem::from_str).collect();
("debug_assert_ne!", 2),
];
+fn choose_separator_tactic(context: &RewriteContext, span: Span) -> Option<SeparatorTactic> {
+ if context.inside_macro() {
+ if span_ends_with_comma(context, span) {
+ Some(SeparatorTactic::Always)
+ } else {
+ Some(SeparatorTactic::Never)
+ }
+ } else {
+ None
+ }
+}
+
pub fn rewrite_call(
context: &RewriteContext,
callee: &str,
shape,
span,
context.config.width_heuristics().fn_call_width,
- if context.inside_macro() {
- if span_ends_with_comma(context, span) {
- Some(SeparatorTactic::Always)
- } else {
- Some(SeparatorTactic::Never)
- }
- } else {
- None
- },
+ choose_separator_tactic(context, span),
)
}
pub fn span_ends_with_comma(context: &RewriteContext, span: Span) -> bool {
let mut result: bool = Default::default();
let mut prev_char: char = Default::default();
+ let closing_delimiters = &[')', '}', ']'];
for (kind, c) in CharClasses::new(context.snippet(span).chars()) {
match c {
_ if kind.is_comment() || c.is_whitespace() => continue,
- ')' | '}' => result = result && prev_char != ')' && prev_char != '}',
+ c if closing_delimiters.contains(&c) => {
+ result &= !closing_delimiters.contains(&prev_char);
+ }
',' => result = true,
_ => result = false,
}
// Extract comments within parens.
let mut pre_comment;
let mut post_comment;
+ let remove_nested_parens = context.config.remove_nested_parens();
loop {
// 1 = "(" or ")"
let pre_span = mk_sp(span.lo() + BytePos(1), subexpr.span.lo());
// Remove nested parens if there are no comments.
if let ast::ExprKind::Paren(ref subsubexpr) = subexpr.node {
- if pre_comment.is_empty() && post_comment.is_empty() {
+ if remove_nested_parens && pre_comment.is_empty() && post_comment.is_empty() {
span = subexpr.span;
subexpr = subsubexpr;
continue;
break;
}
- let total_paren_overhead = paren_overhead(context);
- let paren_overhead = total_paren_overhead / 2;
- let sub_shape = shape
- .offset_left(paren_overhead)
- .and_then(|s| s.sub_width(paren_overhead))?;
-
- let paren_wrapper = |s: &str| {
- if context.config.spaces_within_parens_and_brackets() && !s.is_empty() {
- format!("( {}{}{} )", pre_comment, s, post_comment)
- } else {
- format!("({}{}{})", pre_comment, s, post_comment)
- }
- };
+ // 1 `(`
+ let sub_shape = shape.offset_left(1).and_then(|s| s.sub_width(1))?;
let subexpr_str = subexpr.rewrite(context, sub_shape)?;
debug!("rewrite_paren, subexpr_str: `{:?}`", subexpr_str);
- if subexpr_str.contains('\n')
- || first_line_width(&subexpr_str) + total_paren_overhead <= shape.width
- {
- Some(paren_wrapper(&subexpr_str))
+ // 2 = `()`
+ if subexpr_str.contains('\n') || first_line_width(&subexpr_str) + 2 <= shape.width {
+ Some(format!("({}{}{})", pre_comment, &subexpr_str, post_comment))
} else {
None
}
) -> Option<String> {
let expr_str = expr.rewrite(context, shape)?;
- let (lbr, rbr) = if context.config.spaces_within_parens_and_brackets() {
- ("[ ", " ]")
- } else {
- ("[", "]")
- };
-
- let offset = last_line_width(&expr_str) + lbr.len();
+ let offset = last_line_width(&expr_str) + 1;
let rhs_overhead = shape.rhs_overhead(context.config);
let index_shape = if expr_str.contains('\n') {
Shape::legacy(context.config.max_width(), shape.indent)
.offset_left(offset)
- .and_then(|shape| shape.sub_width(rbr.len() + rhs_overhead))
+ .and_then(|shape| shape.sub_width(1 + rhs_overhead))
} else {
- shape.visual_indent(offset).sub_width(offset + rbr.len())
+ shape.visual_indent(offset).sub_width(offset + 1)
};
let orig_index_rw = index_shape.and_then(|s| index.rewrite(context, s));
// Return if index fits in a single line.
match orig_index_rw {
Some(ref index_str) if !index_str.contains('\n') => {
- return Some(format!("{}{}{}{}", expr_str, lbr, index_str, rbr));
+ return Some(format!("{}[{}]", expr_str, index_str));
}
_ => (),
}
// Try putting index on the next line and see if it fits in a single line.
let indent = shape.indent.block_indent(context.config);
- let index_shape = Shape::indented(indent, context.config).offset_left(lbr.len())?;
- let index_shape = index_shape.sub_width(rbr.len() + rhs_overhead)?;
+ let index_shape = Shape::indented(indent, context.config).offset_left(1)?;
+ let index_shape = index_shape.sub_width(1 + rhs_overhead)?;
let new_index_rw = index.rewrite(context, index_shape);
match (orig_index_rw, new_index_rw) {
(_, Some(ref new_index_str)) if !new_index_str.contains('\n') => Some(format!(
- "{}{}{}{}{}",
+ "{}{}[{}]",
expr_str,
indent.to_string_with_newline(context.config),
- lbr,
new_index_str,
- rbr
)),
(None, Some(ref new_index_str)) => Some(format!(
- "{}{}{}{}{}",
+ "{}{}[{}]",
expr_str,
indent.to_string_with_newline(context.config),
- lbr,
new_index_str,
- rbr
)),
- (Some(ref index_str), _) => Some(format!("{}{}{}{}", expr_str, lbr, index_str, rbr)),
+ (Some(ref index_str), _) => Some(format!("{}[{}]", expr_str, index_str)),
_ => None,
}
}
let nested_shape = shape_for_tactic(tactic, h_shape, v_shape);
let ends_with_comma = span_ends_with_comma(context, span);
- let force_no_trailing_comma = if context.inside_macro() && !ends_with_comma {
- true
- } else {
- false
- };
+ let force_no_trailing_comma = context.inside_macro() && !ends_with_comma;
let fmt = struct_lit_formatting(
nested_shape,
one_line_width: usize,
) -> String {
if context.config.indent_style() == IndentStyle::Block
- && (fields_str.contains('\n') || !context.config.struct_lit_single_line()
+ && (fields_str.contains('\n')
+ || !context.config.struct_lit_single_line()
|| fields_str.len() > one_line_width)
{
format!(
Some(attrs_str + &name)
} else {
let mut separator = String::from(struct_lit_field_separator(context.config));
- for _ in 0..prefix_max_width.checked_sub(name.len()).unwrap_or(0) {
+ for _ in 0..prefix_max_width.saturating_sub(name.len()) {
separator.push(' ');
}
let overhead = name.len() + separator.len();
.next()
.unwrap()
.rewrite(context, nested_shape)
- .map(|s| {
- if context.config.spaces_within_parens_and_brackets() {
- format!("( {}, )", s)
- } else {
- format!("({},)", s)
- }
- });
+ .map(|s| format!("({},)", s));
}
let list_lo = context.snippet_provider.span_after(span, "(");
};
let list_str = write_list(&item_vec, &fmt)?;
- if context.config.spaces_within_parens_and_brackets() && !list_str.is_empty() {
- Some(format!("( {} )", list_str))
- } else {
- Some(format!("({})", list_str))
- }
+ Some(format!("({})", list_str))
}
pub fn rewrite_tuple<'a, T>(
} else {
Some(SeparatorTactic::Never)
}
+ } else if items.len() == 1 {
+ Some(SeparatorTactic::Always)
} else {
- if items.len() == 1 {
- Some(SeparatorTactic::Always)
- } else {
- None
- }
+ None
};
overflow::rewrite_with_parens(
context,
rhs_tactics: RhsTactics,
) -> Option<String> {
let lhs = lhs.into();
- let last_line_width = last_line_width(&lhs)
- .checked_sub(if lhs.contains('\n') {
- shape.indent.width()
- } else {
- 0
- })
- .unwrap_or(0);
+ let last_line_width = last_line_width(&lhs).saturating_sub(if lhs.contains('\n') {
+ shape.indent.width()
+ } else {
+ 0
+ });
// 1 = space between operator and rhs.
let orig_shape = shape.offset_left(last_line_width + 1).unwrap_or(Shape {
width: 0,
}
pub fn prefer_next_line(orig_rhs: &str, next_line_rhs: &str, rhs_tactics: RhsTactics) -> bool {
- rhs_tactics == RhsTactics::ForceNextLine || !next_line_rhs.contains('\n')
+ rhs_tactics == RhsTactics::ForceNextLine
+ || !next_line_rhs.contains('\n')
|| count_newlines(orig_rhs) > count_newlines(next_line_rhs) + 1
}
projects / rust.git / blobdiff