to use find_last_uncommented

 to remove has_rhs_comment

Author: rchaser53

src/expr.rs

@@ -1887,7 +1887,6 @@ pub(crate) fn rewrite_assign_rhs_expr<R: Rewrite>(
     ex: &R,
     shape: Shape,
     rhs_tactics: RhsTactics,
-    has_rhs_comment: bool,
 ) -> Option<String> {
     let last_line_width = last_line_width(&lhs).saturating_sub(if lhs.contains('\n') {
         shape.indent.width()
@@ -1900,6 +1899,12 @@ pub(crate) fn rewrite_assign_rhs_expr<R: Rewrite>(
         offset: shape.offset + last_line_width + 1,
         ..shape
     });
+    let has_rhs_comment = if let Some(offset) = lhs.find_last_uncommented("=") {
+        lhs.trim_end().len() > offset + 1
+    } else {
+        false
+    };
+
     choose_rhs(
         context,
         ex,
@@ -1918,7 +1923,7 @@ pub(crate) fn rewrite_assign_rhs_with<S: Into<String>, R: Rewrite>(
     rhs_tactics: RhsTactics,
 ) -> Option<String> {
     let lhs = lhs.into();
-    let rhs = rewrite_assign_rhs_expr(context, &lhs, ex, shape, rhs_tactics, false)?;
+    let rhs = rewrite_assign_rhs_expr(context, &lhs, ex, shape, rhs_tactics)?;
     Some(lhs + &rhs)
 }
 

src/items.rs

@@ -111,7 +111,6 @@ impl Rewrite for ast::Local {
 
         result.push_str(&infix);
 
-        let mut has_comment_between_assign_and_rhs = false;
         if let Some(ref ex) = self.init {
             let base_span = if let Some(ref ty) = self.ty {
                 mk_sp(ty.span.hi(), self.span.hi())
@@ -161,7 +160,6 @@ impl Rewrite for ast::Local {
                     result.push_str(new_indent_str);
                     result.push_str(comment_after_assign);
                     result.push_str(new_indent_str);
-                    has_comment_between_assign_and_rhs = true;
                 }
             }
 
@@ -173,7 +171,6 @@ impl Rewrite for ast::Local {
                 &**ex,
                 nested_shape,
                 RhsTactics::Default,
-                has_comment_between_assign_and_rhs,
             )?;
             result = result + &rhs;
         }