From 1899b27b791734a6b72e28cfb1420536c6035ee4 Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 21 May 2020 15:26:12 +0200 Subject: added exchanger as seperate component/system; refactored other interactions; parameter parsing returns result instead of option --- src/template.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/template.rs') diff --git a/src/template.rs b/src/template.rs index 0ac03cd..7422465 100644 --- a/src/template.rs +++ b/src/template.rs @@ -89,11 +89,11 @@ impl Template { let name = EntityType(val.get("type").ok_or(perr!("template doesn't have 'type'"))?.as_str().ok_or(perr!("template type not a string"))?.to_string()); let mut args = Vec::new(); for arg in val.get("args").unwrap_or(&json!([])).as_array().ok_or(perr!("template args not an array"))? { - args.push(Parameter::guess_from_json(arg).ok_or(perr!("template arg {:?} not a parameter", arg))?); + args.push(Parameter::guess_from_json(arg)?); } let mut kwargs = HashMap::new(); for (key, arg) in val.get("kwargs").unwrap_or(&json!({})).as_object().ok_or(perr!("template kwargs not a json object"))? { - kwargs.insert(key.to_string(), Parameter::guess_from_json(arg).ok_or(perr!("template kwarg {}: {:?} not a parameter", key, arg))?); + kwargs.insert(key.to_string(), Parameter::guess_from_json(arg)?); } let save = if let Some(saveval) = val.get("save") { -- cgit