use std::iter::repeat;
-use config::lists::*;
use syntax::source_map::{BytePos, Span};
use syntax::{ast, ptr};
-use comment::{combine_strs_with_missing_comments, rewrite_comment};
-use config::{Config, ControlBraceStyle, IndentStyle};
-use expr::{
+use crate::comment::{combine_strs_with_missing_comments, rewrite_comment};
+use crate::config::lists::*;
+use crate::config::{Config, ControlBraceStyle, IndentStyle, Version};
+use crate::expr::{
format_expr, is_empty_block, is_simple_block, is_unsafe_block, prefer_next_line, rewrite_cond,
rewrite_multiple_patterns, ExprType, RhsTactics,
};
-use lists::{itemize_list, write_list, ListFormatting};
-use rewrite::{Rewrite, RewriteContext};
-use shape::Shape;
-use source_map::SpanUtils;
-use spanned::Spanned;
-use utils::{
+use crate::lists::{itemize_list, write_list, ListFormatting};
+use crate::rewrite::{Rewrite, RewriteContext};
+use crate::shape::Shape;
+use crate::source_map::SpanUtils;
+use crate::spanned::Spanned;
+use crate::utils::{
contains_skip, extra_offset, first_line_width, inner_attributes, last_line_extendable, mk_sp,
- ptr_vec_to_ref_vec, trimmed_last_line_width,
+ ptr_vec_to_ref_vec, semicolon_for_expr, trimmed_last_line_width,
};
/// A simple wrapper type against `ast::Arm`. Used inside `write_list()`.
}
impl<'a> Rewrite for ArmWrapper<'a> {
- fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
+ fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {
rewrite_match_arm(context, self.arm, shape, self.is_last)
}
}
pub fn rewrite_match(
- context: &RewriteContext,
+ context: &RewriteContext<'_>,
cond: &ast::Expr,
arms: &[ast::Arm],
shape: Shape,
/// Collect a byte position of the beginning `|` for each arm, if available.
fn collect_beginning_verts(
- context: &RewriteContext,
+ context: &RewriteContext<'_>,
arms: &[ast::Arm],
span: Span,
) -> Vec<Option<BytePos>> {
}
fn rewrite_match_arms(
- context: &RewriteContext,
+ context: &RewriteContext<'_>,
arms: &[ast::Arm],
shape: Shape,
span: Span,
}
fn rewrite_match_arm(
- context: &RewriteContext,
+ context: &RewriteContext<'_>,
arm: &ast::Arm,
shape: Shape,
is_last: bool,
}
fn block_can_be_flattened<'a>(
- context: &RewriteContext,
+ context: &RewriteContext<'_>,
expr: &'a ast::Expr,
) -> Option<&'a ast::Block> {
match expr.node {
// @extend: true if the arm body can be put next to `=>`
// @body: flattened body, if the body is block with a single expression
fn flatten_arm_body<'a>(
- context: &'a RewriteContext,
+ context: &'a RewriteContext<'_>,
body: &'a ast::Expr,
opt_shape: Option<Shape>,
) -> (bool, &'a ast::Expr) {
}
fn rewrite_match_body(
- context: &RewriteContext,
+ context: &RewriteContext<'_>,
body: &ptr::P<ast::Expr>,
pats_str: &str,
shape: Shape,
// Look for comments between `=>` and the start of the body.
let arrow_comment = {
let arrow_snippet = context.snippet(arrow_span).trim();
- let arrow_index = arrow_snippet.find("=>").unwrap();
+ // search for the arrow starting from the end of the snippet since there may be a match
+ // expression within the guard
+ let arrow_index = arrow_snippet.rfind("=>").unwrap();
// 2 = `=>`
let comment_str = arrow_snippet[arrow_index + 2..].trim();
if comment_str.is_empty() {
} else {
""
};
- ("{", format!("{}}}{}", indent_str, comma))
+ let semicolon = if context.config.version() == Version::One {
+ ""
+ } else {
+ if semicolon_for_expr(context, body) {
+ ";"
+ } else {
+ ""
+ }
+ };
+ ("{", format!("{}{}}}{}", semicolon, indent_str, comma))
} else {
("", String::from(","))
};
}
impl Rewrite for ast::Guard {
- fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
+ fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {
match self {
ast::Guard::If(ref expr) => expr.rewrite(context, shape),
}
// The `if ...` guard on a match arm.
fn rewrite_guard(
- context: &RewriteContext,
+ context: &RewriteContext<'_>,
guard: &Option<ast::Guard>,
shape: Shape,
// The amount of space used up on this line for the pattern in
&& budget >= 2
&& (block_str[1..].find(|c: char| !c.is_whitespace()).unwrap() == block_str.len() - 2)
{
- "{}".to_owned()
+ String::from("{}")
} else {
- block_str.to_owned()
+ block_str
}
})
}