refactor: reduce Option<P<Expr>> rewrite scope to PatKind::Range

Author: calebcartwright

rustfmt-core/rustfmt-lib/src/expr.rs

@@ -42,17 +42,6 @@ impl Rewrite for ast::Expr {
     }
 }
 
-impl Rewrite for Option<ptr::P<ast::Expr>> {
-    fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {
-        match &self {
-            None => Some("".to_owned()),
-            Some(ref exp) => {
-                exp.rewrite(context, shape)
-            }
-        }
-    }
-}
-
 #[derive(Copy, Clone, PartialEq)]
 pub(crate) enum ExprType {
     Statement,

rustfmt-core/rustfmt-lib/src/patterns.rs

@@ -180,6 +180,16 @@ impl Rewrite for Pat {
                 }
             }
             PatKind::Range(ref lhs, ref rhs, ref end_kind) => {
+                impl Rewrite for Option<ptr::P<ast::Expr>> {
+                    fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {
+                        match &self {
+                            None => Some("".to_owned()),
+                            Some(ref exp) => {
+                                exp.rewrite(context, shape)
+                            }
+                        }
+                    }
+                }
                 let infix = match end_kind.node {
                     RangeEnd::Included(RangeSyntax::DotDotDot) => "...",
                     RangeEnd::Included(RangeSyntax::DotDotEq) => "..=",