Changes per revierwr comments

Author: davidBar-On

src/items.rs

@@ -112,52 +112,60 @@ impl Rewrite for ast::Local {
 
         result.push_str(&infix);
 
-        if context.config.version() == Version::One {
-            if let Some((init, _els)) = self.kind.init_else_opt() {
-                // 1 = trailing semicolon;
-                let nested_shape = shape.sub_width(1)?;
-
-                result = rewrite_assign_rhs(
-                    context,
-                    result,
-                    init,
-                    &RhsAssignKind::Expr(&init.kind, init.span),
-                    nested_shape,
-                )?;
-                // todo else
-            }
-        } else {
-            // Version:Two+
-            if let Some(expr) = self.kind.init() {
-                let base_span = if let Some(ref ty) = self.ty {
-                    mk_sp(ty.span.hi(), self.span.hi())
-                } else {
-                    mk_sp(self.pat.span.hi(), self.span.hi())
-                };
-
-                let comment_lo = context.snippet_provider.span_after(base_span, "=");
-                let comment_span = mk_sp(comment_lo, expr.span.lo());
+        if let Some((init, _els)) = self.kind.init_else_opt() {
+            let base_span = if let Some(ref ty) = self.ty {
+                mk_sp(ty.span.hi(), self.span.hi())
+            } else {
+                mk_sp(self.pat.span.hi(), self.span.hi())
+            };
 
-                // 1 = trailing semicolon;
-                let nested_shape = shape.sub_width(1)?;
-                result = rewrite_assign_rhs_with_comments(
-                    context,
-                    result,
-                    expr,
-                    nested_shape,
-                    &RhsAssignKind::Expr(&expr.kind, expr.span),
-                    RhsTactics::Default,
-                    comment_span,
-                    true,
-                )?;
-            }
+            result = rewrite_initializer_expr(context, init, result, base_span, shape)?;
         }
+        // todo else of kind.init_else_opt
 
         result.push(';');
         Some(result)
     }
 }
 
+fn rewrite_initializer_expr(
+    context: &RewriteContext<'_>,
+    init: &ast::Expr,
+    lhs: String,
+    base_span: Span,
+    shape: Shape,
+) -> Option<String> {
+    if context.config.version() == Version::One {
+        // 1 = trailing semicolon;
+        let nested_shape = shape.sub_width(1)?;
+
+        rewrite_assign_rhs(
+            context,
+            lhs,
+            init,
+            &RhsAssignKind::Expr(&init.kind, init.span),
+            nested_shape,
+        )
+    } else {
+        // Version:Two+
+        let comment_lo = context.snippet_provider.span_after(base_span, "=");
+        let comment_span = mk_sp(comment_lo, init.span.lo());
+
+        // 1 = trailing semicolon;
+        let nested_shape = shape.sub_width(1)?;
+        rewrite_assign_rhs_with_comments(
+            context,
+            lhs,
+            init,
+            nested_shape,
+            &RhsAssignKind::Expr(&init.kind, init.span),
+            RhsTactics::Default,
+            comment_span,
+            true,
+        )
+    }
+}
+
 // FIXME convert to using rewrite style rather than visitor
 // FIXME format modules in this style
 #[allow(dead_code)]