fixes errors in conversations

Author: Alexander Glusker

src/expr.rs

@@ -227,12 +227,12 @@ pub(crate) fn format_expr(
         ast::ExprKind::MacCall(ref mac) => {
             let (rewrite, _) = rewrite_macro(mac, None, context, shape, MacroPosition::Expression);
             rewrite.or_else(|| {
-                    wrap_str(
-                        context.snippet(expr.span).to_owned(),
-                        context.config.max_width(),
-                        shape,
-                    )
-                })
+                wrap_str(
+                    context.snippet(expr.span).to_owned(),
+                    context.config.max_width(),
+                    shape,
+                )
+            })
         }
         ast::ExprKind::Ret(None) => Some("return".to_owned()),
         ast::ExprKind::Ret(Some(ref expr)) => {

src/macros.rs

@@ -217,16 +217,16 @@ fn rewrite_macro_inner(
     let has_comment = contains_comment(context.snippet(mac.span()));
     if ts.is_empty() && !has_comment {
         let rewrite = match style {
-                Delimiter::Parenthesis if position == MacroPosition::Item => {
-                    Some(format!("{macro_name}();"))
-                }
-                Delimiter::Bracket if position == MacroPosition::Item => {
-                    Some(format!("{macro_name}[];"))
-                }
-                Delimiter::Parenthesis => Some(format!("{macro_name}()")),
-                Delimiter::Bracket => Some(format!("{macro_name}[]")),
-                Delimiter::Brace => Some(format!("{macro_name} {{}}")),
-                _ => unreachable!(),
+            Delimiter::Parenthesis if position == MacroPosition::Item => {
+                Some(format!("{macro_name}();"))
+            }
+            Delimiter::Bracket if position == MacroPosition::Item => {
+                Some(format!("{macro_name}[];"))
+            }
+            Delimiter::Parenthesis => Some(format!("{macro_name}()")),
+            Delimiter::Bracket => Some(format!("{macro_name}[]")),
+            Delimiter::Brace => Some(format!("{macro_name} {{}}")),
+            _ => unreachable!(),
         };
         return (rewrite, Some(style));
     }

src/patterns.rs

@@ -269,7 +269,7 @@ impl Rewrite for Pat {
                 shape,
             ),
             PatKind::MacCall(ref mac) => {
-                let (rewrite, _) = rewrite_macro(mac, None, context, shape, MacroPosition::Pat)
+                let (rewrite, _) = rewrite_macro(mac, None, context, shape, MacroPosition::Pat);
                 rewrite
             }
             PatKind::Paren(ref pat) => pat

src/types.rs

@@ -829,7 +829,8 @@ impl Rewrite for ast::Ty {
             ast::TyKind::BareFn(ref bare_fn) => rewrite_bare_fn(bare_fn, self.span, context, shape),
             ast::TyKind::Never => Some(String::from("!")),
             ast::TyKind::MacCall(ref mac) => {
-                let (rewrite, _) = rewrite_macro(mac, None, context, shape, MacroPosition::Expression);
+                let (rewrite, _) =
+                    rewrite_macro(mac, None, context, shape, MacroPosition::Expression);
                 rewrite
             }
             ast::TyKind::ImplicitSelf => Some(String::from("")),