Merge pull request MaterializeInc#1 from jkosh44/empty-array

benesch · web-flow · commit f58d0101e519 · 2022-10-14T00:21:56.000-04:00
Fix display for 0 dimensional arrays
diff --git a/src/array.rs b/src/array.rs
@@ -39,6 +39,10 @@ where
     I: Iterator<Item = &'a T>,
     T: 'a + fmt::Display,
 {
+    if dims.len() == 0 {
+        return write!(fmt, "{{}}");
+    }
+
     if depth == dims.len() {
         return write!(fmt, "{}", data.next().unwrap());
     }
diff --git a/src/lib.rs b/src/lib.rs
@@ -146,5 +146,8 @@ mod tests {
         a.push(Array::from_vec(vec![4, 5, 6], 3));
         a.wrap(1);
         assert_eq!("[1:1][-2:-1][3:5]={{{1,2,3},{4,5,6}}}", &format!("{}", a));
+
+        let a: Array<String> = Array::from_parts(vec![], vec![]);
+        assert_eq!("{}", &format!("{}", a));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,10 @@ where`
`39`	`39`	`I: Iterator<Item = &'a T>,`
`40`	`40`	`T: 'a + fmt::Display,`
`41`	`41`	`{`
	`42`	`+ if dims.len() == 0 {`
	`43`	`+ return write!(fmt, "{{}}");`
	`44`	`+ }`
	`45`	`+`
`42`	`46`	`if depth == dims.len() {`
`43`	`47`	`return write!(fmt, "{}", data.next().unwrap());`
`44`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,5 +146,8 @@ mod tests {`
`146`	`146`	`a.push(Array::from_vec(vec![4, 5, 6], 3));`
`147`	`147`	`a.wrap(1);`
`148`	`148`	`assert_eq!("[1:1][-2:-1][3:5]={{{1,2,3},{4,5,6}}}", &format!("{}", a));`
	`149`	`+`
	`150`	`+ let a: Array<String> = Array::from_parts(vec![], vec![]);`
	`151`	`+ assert_eq!("{}", &format!("{}", a));`
`149`	`152`	`}`
`150`	`153`	`}`