From 8675ea5ad1b9bd5ea727c0c8cd6eaf485ca28c05 Mon Sep 17 00:00:00 2001 From: troido Date: Fri, 7 Feb 2020 20:31:15 +0100 Subject: argument can be left out --- src/assemblage.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/assemblage.rs') diff --git a/src/assemblage.rs b/src/assemblage.rs index 28bf26f..879cd3e 100644 --- a/src/assemblage.rs +++ b/src/assemblage.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use serde_json::Value; +use serde_json::{Value, json}; use super::componentparameter::ComponentParameter; use super::parameter::{Parameter, ParameterType}; use super::componentwrapper::{ComponentWrapper, ComponentType}; @@ -62,7 +62,7 @@ impl Assemblage { pub fn from_json(val: &Value) -> Result{ let assemblage = Self { - arguments: Self::parse_definition_arguments(val.get("arguments").ok_or("property 'arguments' not found")?)?, + arguments: Self::parse_definition_arguments(val.get("arguments").unwrap_or(&json!([])))?, components: Self::parse_definition_components(val.get("components").ok_or("property 'components' not found")?)? }; assemblage.validate()?; -- cgit