summaryrefslogtreecommitdiff
path: root/src/parameter.rs
diff options
context:
space:
mode:
authortroido <troido@protonmail.com>2020-04-06 16:01:00 +0200
committertroido <troido@protonmail.com>2020-04-06 16:01:00 +0200
commit66a3d3131f32e7bae2f0f7c4fd0b0c876eb3e8a0 (patch)
treeb6e7fe873be9c17b49596946543ee24f3771745d /src/parameter.rs
parente8d3e3c4f69fc5bab2b32b16b7c8c2c4a8a89a4b (diff)
shortcut or defining some entities like crops
Diffstat (limited to 'src/parameter.rs')
-rw-r--r--src/parameter.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/parameter.rs b/src/parameter.rs
index a7419ed..196f5fe 100644
--- a/src/parameter.rs
+++ b/src/parameter.rs
@@ -70,15 +70,15 @@ parameters!(
Template (Template) template, v (Template::from_json(v).ok()?) (v.to_json());
Interaction (Interactable) interaction, _v (Interactable::from_json(_v)?) (panic!("interactions can't be serialized"));
Bool (bool) bool, v (v.as_bool()?) (json!(v));
- List (Vec<Parameter>) list, _v
+ List (Vec<Parameter>) list, v
({
- _v
+ v
.as_array()?
.iter()
.map(|item| Parameter::guess_from_json(item))
.collect::<Option<Vec<Parameter>>>()?
})
- (panic!("can not serialise parameter list"));
+ (json!(["list", v.iter().map(Parameter::to_json).collect::<Vec<Value>>()]));
);
@@ -108,7 +108,6 @@ impl Parameter {
} else if val.is_object(){
ParameterType::Template
} else {
- println!("{:?}", val);
return None
};
Self::from_typed_json(typ, val)