summaryrefslogtreecommitdiff
path: root/src/assemblage.rs
diff options
context:
space:
mode:
authortroido <troido@protonmail.com>2020-02-09 18:53:27 +0100
committertroido <troido@protonmail.com>2020-02-09 18:53:27 +0100
commit105c5ab0c0e969f3fda2cd43ae5195cbdb4da016 (patch)
tree46b65b3e96d9b180bf6658cb968a149eb3cfde0f /src/assemblage.rs
parentb1da31499de4145b1f77296cbea0c637e6f866bf (diff)
Revert "no templates in the world; only pre-entities"
This reverts commit b56add981c2f520789b97d1ee6f71dae41e8c900.
Diffstat (limited to 'src/assemblage.rs')
-rw-r--r--src/assemblage.rs4
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 {