mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fold collections debug impls

Browse Source 
Also convert [T]'s Debug impl. The behavior of the alternate flag here's
changing.
This commit is contained in:
Steven Fackler 2015-03-28 11:24:26 -07:00
parent 4037f2a368
commit b82bcec7ce
6 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcollections/btree/map.rs
View File

@ -904,11 +904,7 @@ fn cmp(&self, other: &BTreeMap<K, V>) -> Ordering {
#[stable(feature = "rust1", since = "1.0.0")]
impl<K: Debug, V: Debug> Debug for BTreeMap<K, V> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let mut builder = f.debug_map();
for (k, v) in self {
builder = builder.entry(k, v);
}
builder.finish()
self.iter().fold(f.debug_map(), |b, (k, v)| b.entry(k, v)).finish()
}
}

6
src/libcollections/btree/set.rs
View File

@ -628,11 +628,7 @@ fn bitor(self, rhs: &BTreeSet<T>) -> BTreeSet<T> {
#[stable(feature = "rust1", since = "1.0.0")]
impl<T: Debug> Debug for BTreeSet<T> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let mut builder = f.debug_set();
for x in self {
builder = builder.entry(x);
}
builder.finish()
self.iter().fold(f.debug_set(), |b, e| b.entry(e)).finish()
}
}

6
src/libcollections/linked_list.rs
View File

@ -927,11 +927,7 @@ fn clone(&self) -> LinkedList<A> {
#[stable(feature = "rust1", since = "1.0.0")]
impl<A: fmt::Debug> fmt::Debug for LinkedList<A> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let mut builder = f.debug_list();
for e in self {
builder = builder.entry(e);
}
builder.finish()
self.iter().fold(f.debug_list(), |b, e| b.entry(e)).finish()
}
}

17
src/libcore/fmt/mod.rs
View File

@ -1017,22 +1017,7 @@ fn fmt(&self, f: &mut Formatter) -> Result { f.pad("&Any") }
#[stable(feature = "rust1", since = "1.0.0")]
impl<T: Debug> Debug for [T] {
fn fmt(&self, f: &mut Formatter) -> Result {
if f.flags & (1 << (FlagV1::Alternate as u32)) == 0 {
try!(write!(f, "["));
}
let mut is_first = true;
for x in self {
if is_first {
is_first = false;
} else {
try!(write!(f, ", "));
}
try!(write!(f, "{:?}", *x))
}
if f.flags & (1 << (FlagV1::Alternate as u32)) == 0 {
try!(write!(f, "]"));
}
Ok(())
self.iter().fold(f.debug_list(), |b, e| b.entry(e)).finish()
}
}

6
src/libstd/collections/hash/map.rs
View File

@ -1226,11 +1226,7 @@ impl<K, V, S> Debug for HashMap<K, V, S>
where K: Eq + Hash + Debug, V: Debug, S: HashState
{
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let mut builder = f.debug_map();
for (k, v) in self.iter() {
builder = builder.entry(k, v);
}
builder.finish()
self.iter().fold(f.debug_map(), |b, (k, v)| b.entry(k, v)).finish()
}
}

6
src/libstd/collections/hash/set.rs
View File

@ -614,11 +614,7 @@ impl<T, S> fmt::Debug for HashSet<T, S>
S: HashState
{
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let mut builder = f.debug_set();
for x in self {
builder = builder.entry(x);
}
builder.finish()
self.iter().fold(f.debug_set(), |b, e| b.entry(e)).finish()
}
}