From 737186b8901a4c843f5b7eed2f3a9a8a3e41e397 Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sun, 3 Sep 2017 08:09:37 +0900 Subject: [PATCH] Use rewrite() instead of format_expr --- src/expr.rs | 7 +------ src/visitor.rs | 8 +------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/expr.rs b/src/expr.rs index b65383311de..228722474e1 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -876,13 +876,8 @@ fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option { "" }; - let expr_type = match self.node { - ast::StmtKind::Expr(_) => ExprType::SubExpression, - ast::StmtKind::Semi(_) => ExprType::Statement, - _ => unreachable!(), - }; let shape = try_opt!(shape.sub_width(suffix.len())); - format_expr(ex, expr_type, context, shape).map(|s| s + suffix) + format_expr(ex, ExprType::Statement, context, shape).map(|s| s + suffix) } ast::StmtKind::Mac(..) | ast::StmtKind::Item(..) => None, }; diff --git a/src/visitor.rs b/src/visitor.rs index 56c1783476a..a792148130b 100644 --- a/src/visitor.rs +++ b/src/visitor.rs @@ -22,7 +22,6 @@ FindUncommented}; use comment::rewrite_comment; use config::{BraceStyle, Config}; -use expr::{format_expr, ExprType}; use items::{format_impl, format_trait, rewrite_associated_impl_type, rewrite_associated_type, rewrite_static, rewrite_type_alias}; use lists::{itemize_list, write_list, DefinitiveListTactic, ListFormatting, SeparatorPlace, @@ -77,12 +76,7 @@ fn visit_stmt(&mut self, stmt: &ast::Stmt) { let rewrite = stmt.rewrite(&self.get_context(), self.shape()); self.push_rewrite(stmt.span(), rewrite); } - ast::StmtKind::Expr(ref expr) => { - let rewrite = - format_expr(expr, ExprType::Statement, &self.get_context(), self.shape()); - self.push_rewrite(stmt.span(), rewrite) - } - ast::StmtKind::Semi(..) => { + ast::StmtKind::Expr(..) | ast::StmtKind::Semi(..) => { let rewrite = stmt.rewrite(&self.get_context(), self.shape()); self.push_rewrite(stmt.span(), rewrite) } -- 2.44.0