diff options
Diffstat (limited to 'src/assemblage.rs')
| -rw-r--r-- | src/assemblage.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/assemblage.rs b/src/assemblage.rs index a4179dd..879cd3e 100644 --- a/src/assemblage.rs +++ b/src/assemblage.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use serde_json::{Value, json}; use super::componentparameter::ComponentParameter; use super::parameter::{Parameter, ParameterType}; -use super::componentwrapper::{ComponentWrapper, ComponentType, PreEntity}; +use super::componentwrapper::{ComponentWrapper, ComponentType}; #[derive(Debug, PartialEq, Clone)] pub struct Assemblage { @@ -92,7 +92,7 @@ impl Assemblage { Ok(arguments) } - pub fn instantiate(&self, args: &Vec<Parameter>, kwargs: &HashMap<String, Parameter>) -> Result<PreEntity, &'static str>{ + pub fn instantiate(&self, args: &Vec<Parameter>, kwargs: &HashMap<String, Parameter>) -> Result<Vec<ComponentWrapper>, &'static str>{ let mut components: Vec<ComponentWrapper> = Vec::new(); let arguments = self.prepare_arguments(args, kwargs)?; for (comptype, compparams) in &self.components { |