Changes per review comments (v3)

rust-lang · Mar 30, 2021 · e4ab01e · e4ab01e
1 parent cc0daad
commit e4ab01e
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 32 deletions.
diff --git a/src/formatting/expr.rs b/src/formatting/expr.rs
@@ -1973,6 +1973,16 @@ pub(crate) fn rewrite_rhs_expr<R: Rewrite>(
     )
 }
 
+fn rewrite_assign_rhs_expr<R: Rewrite>(
+    context: &RewriteContext<'_>,
+    lhs: &str,
+    ex: &R,
+    shape: Shape,
+    rhs_tactics: RhsTactics,
+) -> Option<String> {
+    rewrite_rhs_expr(context, &lhs, ex, shape, rhs_tactics, "=")
+}
+
 pub(crate) fn rewrite_assign_rhs_with<S: Into<String>, R: Rewrite>(
     context: &RewriteContext<'_>,
     lhs: S,
@@ -1981,7 +1991,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_rhs_expr(context, &lhs, ex, shape, rhs_tactics, "=")?;
+    let rhs = rewrite_assign_rhs_expr(context, &lhs, ex, shape, rhs_tactics)?;
     Some(lhs + &rhs)
 }
 
@@ -2001,7 +2011,7 @@ pub(crate) fn rewrite_assign_rhs_with_comments<S: Into<String>, R: Rewrite>(
     } else {
         shape
     };
-    let rhs = rewrite_rhs_expr(context, &lhs, ex, shape, rhs_tactics, "=")?;
+    let rhs = rewrite_assign_rhs_expr(context, &lhs, ex, shape, rhs_tactics)?;
 
     if contains_comment {
         let rhs = rhs.trim_start();
@@ -2011,35 +2021,6 @@ pub(crate) fn rewrite_assign_rhs_with_comments<S: Into<String>, R: Rewrite>(
     }
 }
 
-pub(crate) fn rewrite_trait_rhs_with_comments<S: Into<String>, R: Rewrite>(
-    context: &RewriteContext<'_>,
-    lhs: S,
-    ex: &R,
-    shape: Shape,
-    rhs_tactics: RhsTactics,
-    between_span: Span,
-    allow_extend: bool,
-) -> Option<String> {
-    let lhs = lhs.into();
-    let contains_comment = contains_comment(context.snippet(between_span));
-
-    let rhs = rewrite_rhs_expr(context, &lhs, ex, shape, rhs_tactics, ":")?;
-
-    if contains_comment {
-        let rhs = rhs.trim_start();
-        combine_strs_with_missing_comments(
-            context,
-            &lhs,
-            &rhs,
-            between_span,
-            shape.block_left(context.config.tab_spaces())?,
-            allow_extend,
-        )
-    } else {
-        Some(lhs + &rhs)
-    }
-}
-
 fn choose_rhs<R: Rewrite>(
     context: &RewriteContext<'_>,
     expr: &R,

diff --git a/src/formatting/items.rs b/src/formatting/items.rs
@@ -19,7 +19,7 @@ use crate::formatting::{
     },
     expr::{
         is_empty_block, is_simple_block_stmt, rewrite_assign_rhs, rewrite_assign_rhs_with,
-        rewrite_assign_rhs_with_comments, rewrite_trait_rhs_with_comments, RhsTactics,
+        rewrite_assign_rhs_with_comments, rewrite_rhs_expr, RhsTactics,
     },
     lists::{definitive_tactic, itemize_list, write_list, ListFormatting, Separator},
     macros::{rewrite_macro, MacroPosition},
@@ -1114,6 +1114,36 @@ fn format_struct(
     }
 }
 
+pub(crate) fn rewrite_trait_rhs_with_comments<S: Into<String>, R: Rewrite>(
+    context: &RewriteContext<'_>,
+    lhs: S,
+    ex: &R,
+    shape: Shape,
+    rhs_tactics: RhsTactics,
+    between_span: Span,
+    allow_extend: bool,
+) -> Option<String> {
+    let lhs = lhs.into();
+    let contains_comment = contains_comment(context.snippet(between_span));
+
+    // Not as with `expr` - `shape` is changed only for comments combine, not for rewrite
+    let rhs = rewrite_rhs_expr(context, &lhs, ex, shape, rhs_tactics, ":")?;
+
+    if contains_comment {
+        let rhs = rhs.trim_start();
+        combine_strs_with_missing_comments(
+            context,
+            &lhs,
+            &rhs,
+            between_span,
+            shape.block_left(context.config.tab_spaces())?,
+            allow_extend,
+        )
+    } else {
+        Some(lhs + &rhs)
+    }
+}
+
 pub(crate) fn format_trait(
     context: &RewriteContext<'_>,
     item: &ast::Item,