Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use debug_map to implement Debug

Browse Source
This commit is contained in:
notoria 2021-12-06 23:33:34 +01:00
parent 182d5cf971
commit 81f28bc3cc
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
world/src/site/economy.rs
View File

@ -16,7 +16,7 @@ use lazy_static::lazy_static;
use serde::{Deserialize, Serialize};
use std::{
convert::{TryFrom, TryInto},
fmt::{self, Write},
fmt,
marker::PhantomData,
ops::{Index, IndexMut},
};
@ -98,16 +98,13 @@ impl<V: Default + Copy> Default for GoodMap<V> {
impl<V: Default + Copy + PartialEq + fmt::Debug> fmt::Debug for GoodMap<V> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.write_str("{ ")?;
for i in self.iter() {
if *i.1 != V::default() {
Good::from(i.0).fmt(f)?;
f.write_char(':')?;
i.1.fmt(f)?;
f.write_char(' ')?;
}
}
f.write_char('}')
f.debug_map()
.entries(
self.iter()
.filter(|i| *i.1 != V::default())
.map(|i| (Good::from(i.0), i.1)),
)
.finish()
}
}
@ -216,16 +213,13 @@ impl<V: Default + Copy> Default for LaborMap<V> {
impl<V: Default + Copy + PartialEq + fmt::Debug> fmt::Debug for LaborMap<V> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.write_str("{ ")?;
for i in self.iter() {
if *i.1 != V::default() {
i.0.fmt(f)?;
f.write_char(':')?;
(*i.1).fmt(f)?;
f.write_char(' ')?;
}
}
f.write_char('}')
f.debug_map()
.entries(
self.iter()
.filter(|i| *i.1 != V::default())
.map(|i| (i.0, &*i.1)),
)
.finish()
}
}