Changes per reviewer comments - remove untested handling of assign pre comments

Author: davidBar-On

src/items.rs

@@ -112,56 +112,26 @@ impl Rewrite for ast::Local {
 
         result.push_str(&infix);
 
-        if let Some((init, _els)) = self.kind.init_else_opt() {
+        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 offset = context.snippet(base_span).find_uncommented("=")?;
-            let base_span_lo = base_span.lo();
-
-            let assign_lo = base_span_lo + BytePos(offset as u32);
-            let comment_start_pos = if let Some(ref ty) = self.ty {
-                ty.span.hi()
-            } else {
-                self.pat.span.hi()
-            };
-            let comment_before_assign = context.snippet(mk_sp(comment_start_pos, assign_lo)).trim();
-
-            let assign_hi = base_span_lo + BytePos((offset + 1) as u32);
-            let rhs_span_lo = init.span.lo();
-            let comment_end_pos = if init.attrs.is_empty() {
-                rhs_span_lo
-            } else {
-                let attr_span_lo = init.attrs.first().unwrap().span.lo();
-                // for the case using block
-                // ex. let x = { #![my_attr]do_something(); }
-                if rhs_span_lo < attr_span_lo {
-                    rhs_span_lo
-                } else {
-                    attr_span_lo
-                }
-            };
-
-            if !comment_before_assign.is_empty() {
-                let new_indent_str = &pat_shape
-                    .block_indent(0)
-                    .to_string_with_newline(context.config);
-                result = format!("{}{}{}", comment_before_assign, new_indent_str, result);
-            }
+            let comment_lo = context.snippet_provider.span_after(base_span, "=");
+            let comment_span = mk_sp(comment_lo, expr.span.lo());
 
             // 1 = trailing semicolon;
             let nested_shape = shape.sub_width(1)?;
             result = rewrite_assign_rhs_with_comments(
                 context,
                 result,
-                init,
+                expr,
                 nested_shape,
-                &RhsAssignKind::Expr(&init.kind, init.span),
+                &RhsAssignKind::Expr(&expr.kind, expr.span),
                 RhsTactics::Default,
-                mk_sp(assign_hi, comment_end_pos),
+                comment_span,
                 true,
             )?;
         }