about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-09-27 15:05:17 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-09-27 15:05:17 +0530
commit8c47cfef5d2f8966e749eb307ef9f2a787de3f2a (patch)
treefa4f83f4cafc7818888ec72d655e62adcc0fe573
parentdde7283b807792dab4b2a10bace9b015a28aea02 (diff)
parentdb187188098ebce87ad5d9cf0cb2d7faf8673ba5 (diff)
Rollup merge of #28664 - apasel422:collections-debug, r=alexcrichton
-rw-r--r--src/libcollections/enum_set.rs11
-rw-r--r--src/libcollections/vec_deque.rs9
2 files changed, 2 insertions, 18 deletions
diff --git a/src/libcollections/enum_set.rs b/src/libcollections/enum_set.rs
index 7e7e8ba2356..32cd4193d88 100644
--- a/src/libcollections/enum_set.rs
+++ b/src/libcollections/enum_set.rs
@@ -49,16 +49,7 @@ impl<E> Clone for EnumSet<E> {
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<E:CLike + fmt::Debug> fmt::Debug for EnumSet<E> {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        try!(write!(fmt, "{{"));
-        let mut first = true;
-        for e in self {
-            if !first {
-                try!(write!(fmt, ", "));
-            }
-            try!(write!(fmt, "{:?}", e));
-            first = false;
-        }
-        write!(fmt, "}}")
+        fmt.debug_set().entries(self).finish()
     }
 }
 
diff --git a/src/libcollections/vec_deque.rs b/src/libcollections/vec_deque.rs
index 4ee9787c9ec..6de5f27068d 100644
--- a/src/libcollections/vec_deque.rs
+++ b/src/libcollections/vec_deque.rs
@@ -1787,14 +1787,7 @@ impl<'a, T: 'a + Copy> Extend<&'a T> for VecDeque<T> {
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<T: fmt::Debug> fmt::Debug for VecDeque<T> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        try!(write!(f, "["));
-
-        for (i, e) in self.iter().enumerate() {
-            if i != 0 { try!(write!(f, ", ")); }
-            try!(write!(f, "{:?}", *e));
-        }
-
-        write!(f, "]")
+        f.debug_list().entries(self).finish()
     }
 }