remove generic indented_list implementation

Author: lovasoa

src/ast/query.rs

@@ -2883,26 +2883,16 @@ pub struct Values {
 
 impl fmt::Display for Values {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        struct DisplayRow<'a> {
-            exprs: &'a [Expr],
-            explicit_row: bool,
-        }
-        impl fmt::Display for DisplayRow<'_> {
-            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                let comma_separated = display_comma_separated(self.exprs);
-                if self.explicit_row {
-                    write!(f, "ROW({})", comma_separated)
-                } else {
-                    write!(f, "({})", comma_separated)
-                }
-            }
-        }
-        let row_display_iter = self.rows.iter().map(|row| DisplayRow {
-            exprs: row,
-            explicit_row: self.explicit_row,
-        });
         f.write_str("VALUES")?;
-        indented_list(f, row_display_iter)?;
+        let prefix = if self.explicit_row { "ROW" } else { "" };
+        let mut separator = "";
+        for row in &self.rows {
+            f.write_str(separator)?;
+            separator = ",";
+            SpaceOrNewline.fmt(f)?;
+            let comma_separated = display_comma_separated(row);
+            Indent(format_args!("{prefix}({comma_separated})")).fmt(f)?;
+        }
         Ok(())
     }
 }

src/display_utils.rs

@@ -68,17 +68,12 @@ impl Display for SpaceOrNewline {
 
 /// A value that displays a comma-separated list of values.
 /// When pretty-printed (using {:#}), it displays each value on a new line.
-pub(crate) struct DisplayCommaSeparated<I, T: fmt::Display>(I)
-where
-    I: IntoIterator<Item = T> + Clone;
+pub(crate) struct DisplayCommaSeparated<'a, T: fmt::Display>(&'a [T]);
 
-impl<I, T: fmt::Display> fmt::Display for DisplayCommaSeparated<I, T>
-where
-    I: IntoIterator<Item = T> + Clone,
-{
+impl<T: fmt::Display> fmt::Display for DisplayCommaSeparated<'_, T> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let mut first = true;
-        for t in self.0.clone() {
+        for t in self.0 {
             if !first {
                 f.write_char(',')?;
                 SpaceOrNewline.fmt(f)?;
@@ -91,12 +86,9 @@ where
 }
 
 /// Displays a whitespace, followed by a comma-separated list that is indented when pretty-printed.
-pub(crate) fn indented_list<I, T: fmt::Display>(f: &mut fmt::Formatter, iter: I) -> fmt::Result
-where
-    I: IntoIterator<Item = T> + Clone,
-{
+pub(crate) fn indented_list<T: fmt::Display>(f: &mut fmt::Formatter, items: &[T]) -> fmt::Result {
     SpaceOrNewline.fmt(f)?;
-    Indent(DisplayCommaSeparated(iter)).fmt(f)
+    Indent(DisplayCommaSeparated(items)).fmt(f)
 }
 
 #[cfg(test)]