From e8d3e3c4f69fc5bab2b32b16b7c8c2c4a8a89a4b Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Mon, 6 Apr 2020 10:37:53 +0200
Subject: made parseerrors their own thing

---
 src/template.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/template.rs')

diff --git a/src/template.rs b/src/template.rs
index 0f62754..c2f905f 100644
--- a/src/template.rs
+++ b/src/template.rs
@@ -4,8 +4,8 @@ use std::collections::HashMap;
 use serde_json::{json, Value};
 use crate::{
 	parameter::Parameter,
-	Result,
-	aerr
+	PResult,
+	perr
 };
 
 #[derive(Debug, PartialEq, Eq, Clone, Hash)]
@@ -49,20 +49,20 @@ impl Template {
 		self
 	}
 	
-	pub fn from_json(val: &Value) -> Result<Template> {
+	pub fn from_json(val: &Value) -> PResult<Template> {
 		if val.is_string(){
 			return Ok(Self::empty(val.as_str().unwrap()));
 		}
-		let name = EntityType(val.get("type").ok_or(aerr!("template doesn't have 'type'"))?.as_str().ok_or(aerr!("template type not a string"))?.to_string());
+		let name = EntityType(val.get("type").ok_or(perr!("template doesn't have 'type'"))?.as_str().ok_or(perr!("template type not a string"))?.to_string());
 		let mut args = Vec::new();
-		for arg in val.get("args").unwrap_or(&json!([])).as_array().ok_or(aerr!("template args not an array"))? {
-			args.push(Parameter::guess_from_json(arg).ok_or(aerr!("template arg not a parameter"))?);
+		for arg in val.get("args").unwrap_or(&json!([])).as_array().ok_or(perr!("template args not an array"))? {
+			args.push(Parameter::guess_from_json(arg).ok_or(perr!("template arg not a parameter"))?);
 		}
 		let mut kwargs = HashMap::new();
-		for (key, arg) in val.get("kwargs").unwrap_or(&json!({})).as_object().ok_or(aerr!("template kwargs not a json object"))? {
-			kwargs.insert(key.to_string(), Parameter::guess_from_json(arg).ok_or(aerr!("template arg not a parameter"))?);
+		for (key, arg) in val.get("kwargs").unwrap_or(&json!({})).as_object().ok_or(perr!("template kwargs not a json object"))? {
+			kwargs.insert(key.to_string(), Parameter::guess_from_json(arg).ok_or(perr!("template arg not a parameter"))?);
 		}
-		let save = val.get("save").unwrap_or(&json!(true)).as_bool().ok_or(aerr!("save not a bool"))?;
+		let save = val.get("save").unwrap_or(&json!(true)).as_bool().ok_or(perr!("save not a bool"))?;
 		Ok(Template {name, args, kwargs, save})
 	}
 	
-- 
cgit