From 66a3d3131f32e7bae2f0f7c4fd0b0c876eb3e8a0 Mon Sep 17 00:00:00 2001 From: troido Date: Mon, 6 Apr 2020 16:01:00 +0200 Subject: shortcut or defining some entities like crops --- src/parameter.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/parameter.rs') 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) list, _v + List (Vec) list, v ({ - _v + v .as_array()? .iter() .map(|item| Parameter::guess_from_json(item)) .collect::>>()? }) - (panic!("can not serialise parameter list")); + (json!(["list", v.iter().map(Parameter::to_json).collect::>()])); ); @@ -108,7 +108,6 @@ impl Parameter { } else if val.is_object(){ ParameterType::Template } else { - println!("{:?}", val); return None }; Self::from_typed_json(typ, val) -- cgit