Clean up debug impls

rust-phf · Mar 30, 2015 · 7e32f39 · 7e32f39
1 parent 7f0392a
commit 7e32f39
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 20 deletions.
diff --git a/phf/src/map.rs b/phf/src/map.rs
@@ -26,11 +26,7 @@ pub struct Map<K:'static, V:'static> {
 
 impl<K, V> fmt::Debug for Map<K, V> where K: fmt::Debug, V: fmt::Debug {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        let mut builder = fmt.debug_map();
-        for (k, v) in self {
-            builder = builder.entry(k, v);
-        }
-        builder.finish()
+        self.entries().fold(fmt.debug_map(), |b, (k, v)| b.entry(k, v)).finish()
     }
 }
 

diff --git a/phf/src/ordered_map.rs b/phf/src/ordered_map.rs
@@ -32,11 +32,7 @@ pub struct OrderedMap<K:'static, V:'static> {
 
 impl<K, V> fmt::Debug for OrderedMap<K, V> where K: fmt::Debug, V: fmt::Debug {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        let mut builder = fmt.debug_map();
-        for (k, v) in self {
-            builder = builder.entry(k, v);
-        }
-        builder.finish()
+        self.entries().fold(fmt.debug_map(), |b, (k, v)| b.entry(k, v)).finish()
     }
 }
 

diff --git a/phf/src/ordered_set.rs b/phf/src/ordered_set.rs
@@ -23,11 +23,7 @@ pub struct OrderedSet<T:'static> {
 
 impl<T> fmt::Debug for OrderedSet<T> where T: fmt::Debug {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        let mut builder = fmt.debug_set();
-        for entry in self {
-            builder = builder.entry(entry);
-        }
-        builder.finish()
+        self.iter().fold(fmt.debug_set(), |b, e| b.entry(e)).finish()
     }
 }
 

diff --git a/phf/src/set.rs b/phf/src/set.rs
@@ -22,11 +22,7 @@ pub struct Set<T:'static> {
 
 impl<T> fmt::Debug for Set<T> where T: fmt::Debug {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        let mut builder = fmt.debug_set();
-        for entry in self {
-            builder = builder.entry(entry);
-        }
-        builder.finish()
+        self.iter().fold(fmt.debug_set(), |b, e| b.entry(e)).finish()
     }
 }