Fix indentation for formatting higher-dim arrays

Author: jturner314

src/arrayformat.rs

@@ -70,7 +70,9 @@ fn format_array<A, S, D, F>(
     view: &ArrayBase<S, D>,
     f: &mut fmt::Formatter,
     mut format: F,
-    limit: Ix) -> fmt::Result
+    limit: Ix,
+    depth: usize,
+) -> fmt::Result
 where
     F: FnMut(&A, &mut fmt::Formatter) -> fmt::Result + Clone,
     D: Dimension,
@@ -98,21 +100,27 @@ where
 
             let n_to_be_printed = to_be_printed.len();
 
+            let indent = " ".repeat(depth + 1);
+
             write!(f, "[")?;
             for (j, index) in to_be_printed.into_iter().enumerate() {
                 match index {
                     PrintableCell::ElementIndex(i) => {
+                        // Indent all but the first line.
+                        if j != 0 {
+                            write!(f, "{}", indent)?;
+                        }
                         // Proceed recursively with the (n-1)-dimensional slice
                         format_array(
-                            &view.index_axis(Axis(0), i), f, format.clone(), limit
+                            &view.index_axis(Axis(0), i), f, format.clone(), limit, depth + 1
                         )?;
                         // We need to add a separator after each slice,
                         // apart from the last one
                         if j != n_to_be_printed - 1 {
-                            write!(f, ",\n ")?
+                            write!(f, ",\n")?
                         }
                     },
-                    PrintableCell::Ellipses => write!(f, "...,\n ")?
+                    PrintableCell::Ellipses => write!(f, "{}...,\n", indent)?,
                 }
             }
             write!(f, "]")?;
@@ -130,7 +138,7 @@ impl<'a, A: fmt::Display, S, D: Dimension> fmt::Display for ArrayBase<S, D>
     where S: Data<Elem=A>,
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        format_array(self, f, <_>::fmt, PRINT_ELEMENTS_LIMIT)
+        format_array(self, f, <_>::fmt, PRINT_ELEMENTS_LIMIT, 0)
     }
 }
 
@@ -143,7 +151,7 @@ impl<'a, A: fmt::Debug, S, D: Dimension> fmt::Debug for ArrayBase<S, D>
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         // Add extra information for Debug
-        format_array(self, f, <_>::fmt, PRINT_ELEMENTS_LIMIT)?;
+        format_array(self, f, <_>::fmt, PRINT_ELEMENTS_LIMIT, 0)?;
         write!(f, " shape={:?}, strides={:?}, layout={:?}",
                self.shape(), self.strides(), layout=self.view().layout())?;
         match D::NDIM {
@@ -162,7 +170,7 @@ impl<'a, A: fmt::LowerExp, S, D: Dimension> fmt::LowerExp for ArrayBase<S, D>
     where S: Data<Elem=A>,
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        format_array(self, f, <_>::fmt, PRINT_ELEMENTS_LIMIT)
+        format_array(self, f, <_>::fmt, PRINT_ELEMENTS_LIMIT, 0)
     }
 }
 
@@ -174,7 +182,7 @@ impl<'a, A: fmt::UpperExp, S, D: Dimension> fmt::UpperExp for ArrayBase<S, D>
     where S: Data<Elem=A>,
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        format_array(self, f, <_>::fmt, PRINT_ELEMENTS_LIMIT)
+        format_array(self, f, <_>::fmt, PRINT_ELEMENTS_LIMIT, 0)
     }
 }
 /// Format the array using `LowerHex` and apply the formatting parameters used
@@ -185,7 +193,7 @@ impl<'a, A: fmt::LowerHex, S, D: Dimension> fmt::LowerHex for ArrayBase<S, D>
     where S: Data<Elem=A>,
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        format_array(self, f, <_>::fmt, PRINT_ELEMENTS_LIMIT)
+        format_array(self, f, <_>::fmt, PRINT_ELEMENTS_LIMIT, 0)
     }
 }
 
@@ -197,7 +205,7 @@ impl<'a, A: fmt::Binary, S, D: Dimension> fmt::Binary for ArrayBase<S, D>
     where S: Data<Elem=A>,
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        format_array(self, f, <_>::fmt, PRINT_ELEMENTS_LIMIT)
+        format_array(self, f, <_>::fmt, PRINT_ELEMENTS_LIMIT, 0)
     }
 }