diff options
| author | troido <troido@protonmail.com> | 2020-09-24 13:10:54 +0200 |
|---|---|---|
| committer | troido <troido@protonmail.com> | 2020-09-24 13:10:54 +0200 |
| commit | e6476e7afff0234d67ebce7c74e4c91c31d87755 (patch) | |
| tree | 638133c0f7c9253e863e01806150f8bec860d12e /src/encyclopedia.rs | |
| parent | 523a635dc88bc7890a0e1d3c062a8165259761d6 (diff) | |
actually use the serde serialisation more
Diffstat (limited to 'src/encyclopedia.rs')
| -rw-r--r-- | src/encyclopedia.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/encyclopedia.rs b/src/encyclopedia.rs index 70f0ac6..8acd7e9 100644 --- a/src/encyclopedia.rs +++ b/src/encyclopedia.rs @@ -1,6 +1,7 @@ use std::collections::HashMap; use serde_json::{Value, json}; +use serde::Deserialize; use crate::{ assemblage::Assemblage, componentwrapper::PreEntity, @@ -59,7 +60,7 @@ impl Encyclopedia { name: name.clone(), ent: if let Some(ent) = v.get("entity") { - Template::from_json(ent)? + Template::deserialize(ent).map_err(|e| perr!("template json error deserializing {:?} {:?}", ent, e))? } else { let enttyp = EntityType(k.clone()); assemblages.insert(enttyp.clone(), Assemblage::from_json(&json!({ |