Make debug impl a display impl

sfackler · sfackler · commit 2bbb725b1f4a · 2015-10-24T14:20:53.000-07:00
diff --git a/src/array.rs b/src/array.rs
@@ -6,13 +6,13 @@ use std::fmt;
 use Dimension;
 
 /// A multi-dimensional array.
-#[derive(PartialEq, Eq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub struct Array<T> {
     dims: Vec<Dimension>,
     data: Vec<T>,
 }
 
-impl<T: fmt::Debug> fmt::Debug for Array<T> {
+impl<T: fmt::Display> fmt::Display for Array<T> {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         if self.dims.iter().any(|dim| dim.lower_bound != 1) {
             for dim in &self.dims {
@@ -30,9 +30,9 @@ fn fmt_helper<'a, T, I>(depth: usize,
                         mut data: &mut I,
                         fmt: &mut fmt::Formatter)
                         -> fmt::Result
-        where I: Iterator<Item=&'a T>, T: 'a+fmt::Debug {
+        where I: Iterator<Item=&'a T>, T: 'a + fmt::Display {
     if depth == dims.len() {
-        return write!(fmt, "{:?}", data.next().unwrap());
+        return write!(fmt, "{}", data.next().unwrap());
     }
 
     try!(write!(fmt, "{{"));
diff --git a/src/lib.rs b/src/lib.rs
@@ -120,17 +120,17 @@ mod tests {
     }
 
     #[test]
-    fn test_debug() {
+    fn test_display() {
         let a = Array::from_vec(vec![0i32, 1, 2, 3, 4], 1);
-        assert_eq!("{0,1,2,3,4}", &format!("{:?}", a));
+        assert_eq!("{0,1,2,3,4}", &format!("{}", a));
 
         let a = Array::from_vec(vec![0i32, 1, 2, 3, 4], -3);
-        assert_eq!("[-3:1]={0,1,2,3,4}", &format!("{:?}", a));
+        assert_eq!("[-3:1]={0,1,2,3,4}", &format!("{}", a));
 
         let mut a = Array::from_vec(vec![1i32, 2, 3], 3);
         a.wrap(-2);
         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));
+        assert_eq!("[1:1][-2:-1][3:5]={{{1,2,3},{4,5,6}}}", &format!("{}", a));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -120,17 +120,17 @@ mod tests {`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`#[test]`
`123`		`- fn test_debug() {`
	`123`	`+ fn test_display() {`
`124`	`124`	`let a = Array::from_vec(vec![0i32, 1, 2, 3, 4], 1);`
`125`		`- assert_eq!("{0,1,2,3,4}", &format!("{:?}", a));`
	`125`	`+ assert_eq!("{0,1,2,3,4}", &format!("{}", a));`
`126`	`126`
`127`	`127`	`let a = Array::from_vec(vec![0i32, 1, 2, 3, 4], -3);`
`128`		`- assert_eq!("[-3:1]={0,1,2,3,4}", &format!("{:?}", a));`
	`128`	`+ assert_eq!("[-3:1]={0,1,2,3,4}", &format!("{}", a));`
`129`	`129`
`130`	`130`	`let mut a = Array::from_vec(vec![1i32, 2, 3], 3);`
`131`	`131`	`a.wrap(-2);`
`132`	`132`	`a.push(Array::from_vec(vec![4, 5, 6], 3));`
`133`	`133`	`a.wrap(1);`
`134`		`- assert_eq!("[1:1][-2:-1][3:5]={{{1,2,3},{4,5,6}}}", &format!("{:?}", a));`
	`134`	`+ assert_eq!("[1:1][-2:-1][3:5]={{{1,2,3},{4,5,6}}}", &format!("{}", a));`
`135`	`135`	`}`
`136`	`136`	`}`