From 105c5ab0c0e969f3fda2cd43ae5195cbdb4da016 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Sun, 9 Feb 2020 18:53:27 +0100
Subject: Revert "no templates in the world; only pre-entities"

This reverts commit b56add981c2f520789b97d1ee6f71dae41e8c900.
---
 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 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 {
-- 
cgit