From f4831d5a265a6dc4f6898ad883ddc9f72f8e62fa Mon Sep 17 00:00:00 2001
From: Micha Reiser <micha@reiser.io>
Date: Fri, 4 Aug 2023 15:22:16 +0200
Subject: [PATCH] Formatter comment handling nits (#6339)

---
 crates/ruff_formatter/src/printer/mod.rs            |  1 -
 crates/ruff_python_formatter/src/comments/format.rs | 10 ++++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/crates/ruff_formatter/src/printer/mod.rs b/crates/ruff_formatter/src/printer/mod.rs
index df74c7ae36..b31260147d 100644
--- a/crates/ruff_formatter/src/printer/mod.rs
+++ b/crates/ruff_formatter/src/printer/mod.rs
@@ -1270,7 +1270,6 @@ impl<'a, 'print> FitsMeasurer<'a, 'print> {
                             MeasureMode::FirstLine => return Fits::Yes,
                             MeasureMode::AllLines => {
                                 self.state.line_width = 0;
-                                self.state.pending_indent = args.indention();
                                 continue;
                             }
                         }
diff --git a/crates/ruff_python_formatter/src/comments/format.rs b/crates/ruff_python_formatter/src/comments/format.rs
index aafb95860f..8d988d2794 100644
--- a/crates/ruff_python_formatter/src/comments/format.rs
+++ b/crates/ruff_python_formatter/src/comments/format.rs
@@ -152,12 +152,10 @@ impl Format<PyFormatContext<'_>> for FormatTrailingComments<'_> {
                 write!(
                     f,
                     [
-                        line_suffix(&format_with(|f| {
-                            write!(
-                                f,
-                                [empty_lines(lines_before_comment), format_comment(trailing)]
-                            )
-                        })),
+                        line_suffix(&format_args![
+                            empty_lines(lines_before_comment),
+                            format_comment(trailing)
+                        ]),
                         expand_parent()
                     ]
                 )?;