Merge pull request #3266 from wada314/fix-2973

[rust.git] / src / overflow.rs

diff --git a/src/overflow.rs b/src/overflow.rs
index fc1803b2ab6af98802e5732c35bad0ac0b51b337..4a583fc1de838773582e434dbe6b292cb1e3ffcd 100644 (file)
--- a/src/overflow.rs
+++ b/src/overflow.rs
@@ -200,7 +200,7 @@ fn into_overflowable_item(&'a self) -> OverflowableItem<'a> {
     }
 }
 
-macro impl_into_overflowable_item_for_ast_node {
+macro_rules! impl_into_overflowable_item_for_ast_node {
     ($($ast_node:ident),*) => {
         $(
             impl<'a> IntoOverflowableItem<'a> for ast::$ast_node {
@@ -212,7 +212,7 @@ fn into_overflowable_item(&'a self) -> OverflowableItem<'a> {
     }
 }
 
-macro impl_into_overflowable_item_for_rustfmt_types {
+macro_rules! impl_into_overflowable_item_for_rustfmt_types {
     ([$($ty:ident),*], [$($ty_with_lifetime:ident),*]) => {
         $(
             impl<'a> IntoOverflowableItem<'a> for $ty {
@@ -404,6 +404,7 @@ fn rewrite_last_item_with_overflow(
                             closures::rewrite_last_closure(self.context, expr, shape)
                         }
                     }
+
                     // When overflowing the expressions which consists of a control flow
                     // expression, avoid condition to use multi line.
                     ast::ExprKind::If(..)
@@ -422,10 +423,11 @@ fn rewrite_last_item_with_overflow(
                             expr.rewrite(self.context, shape)
                         }
                     }
+
                     _ => expr.rewrite(self.context, shape),
                 }
             }
-            item @ _ => item.rewrite(self.context, shape),
+            item => item.rewrite(self.context, shape),
         };
 
         if let Some(rewrite) = rewrite {
@@ -690,7 +692,7 @@ fn need_block_indent(s: &str, shape: Shape) -> bool {
     })
 }
 
-fn can_be_overflowed<'a>(context: &RewriteContext, items: &[OverflowableItem]) -> bool {
+fn can_be_overflowed(context: &RewriteContext, items: &[OverflowableItem]) -> bool {
     items
         .last()
         .map_or(false, |x| x.can_be_overflowed(context, items.len()))