Renamed to DeepCrow

1 files changed, 21 insertions, 21 deletions

diff --git a/crimtag/src/lib.rs b/deepcrow/src/lib.rs
index 0fe0e4e..b10cd03 100644
--- a/crimtag/src/lib.rs
+++ b/deepcrow/src/lib.rs
@@ -9,14 +9,14 @@ mod position;
 mod error;
 pub mod context;
 
-pub use derive::CrimtagMappable;
+pub use derive::DeepCrowMappable;
 
-pub use error::{CrimError,CrimResult};
+pub use error::{DeepCrowError,Result};
 pub use position::*;
 pub use context::{Context,Value,MappedStructure,StatefulContext,MappedValue,MappedList,MappedHash};
 
 #[derive(Debug)]
-pub struct Crimtag {
+pub struct DeepCrow {
     views: HashMap<String, View>,
     sources: Vec<ViewSource>,
 }
@@ -43,7 +43,7 @@ struct View {
 }
 
 impl View {
-    fn process(&self, input: &dyn for<'a> MappedStructure<'a>) -> CrimResult<Context> {
+    fn process(&self, input: &dyn for<'a> MappedStructure<'a>) -> Result<Context> {
         let mut out_vars = Context::new();
         for output in &self.outputs {
             let mut buf = String::new();
@@ -80,7 +80,7 @@ pub enum IdentifierValue {
 
 pub type Identifier = Vec<IdentifierValue>;
 
-impl Crimtag {
+impl DeepCrow {
     pub fn new() -> Self {
         Self {
             views: HashMap::new(),
@@ -101,7 +101,7 @@ impl Crimtag {
         idx
     }
 
-    pub fn load_file(&mut self, path: &Path) -> Result<(),Box::<dyn Error>> {
+    pub fn load_file(&mut self, path: &Path) -> std::result::Result<(),Box::<dyn Error>> {
         let time = if let Ok(meta) = path.metadata() {
             if let Ok(t) = meta.modified() {
                 t
@@ -129,13 +129,13 @@ impl Crimtag {
         Ok(())
     }
 
-    pub fn load_static(&mut self, data: &str) -> CrimResult<()> {
+    pub fn load_static(&mut self, data: &str) -> Result<()> {
         let source_id = self.id_source( &ViewSource::Static );
         let p = parser::Parser::new();
         self.register_views( p.parse( &data, source_id )? )
     }
 
-    pub fn load_external(&mut self, key: &str, data: &str) -> CrimResult<()> {
+    pub fn load_external(&mut self, key: &str, data: &str) -> Result<()> {
         let source_id = self.id_source(
             &ViewSource::External{ key: key.to_string()}
             );
@@ -146,7 +146,7 @@ impl Crimtag {
             )
     }
 
-    fn register_views(&mut self, views: Vec<View>) -> CrimResult<()> {
+    fn register_views(&mut self, views: Vec<View>) -> Result<()> {
         for view in views {
             self.views.insert( view.name.clone(), view );
         }
@@ -165,15 +165,15 @@ impl Crimtag {
         }
     }
 
-    pub fn render_partial(&self, view: &str, input: &dyn for<'a> MappedStructure<'a> ) -> CrimResult<Context> {
+    pub fn render_partial(&self, view: &str, input: &dyn for<'a> MappedStructure<'a> ) -> Result<Context> {
         if let Some(view) = self.views.get(view) {
             return view.process( input )
         } else {
-            return Err(CrimError::other("No such view found".into()));
+            return Err(DeepCrowError::other("No such view found".into()));
         }
     }
 
-    pub fn render(&self, view: &str, input: &dyn for<'a> MappedStructure<'a> ) -> CrimResult<String> {
+    pub fn render(&self, view: &str, input: &dyn for<'a> MappedStructure<'a> ) -> Result<String> {
         if let Some(view) = self.views.get( view ) {
             //println!("::Token tree::\n{:?}", view );
             let mut output = view.process( input )?;
@@ -185,17 +185,17 @@ impl Crimtag {
 
                     Ok(s)
                 } else {
-                    Err(CrimError::other("No content found in root layout.".into()))
+                    Err(DeepCrowError::other("No content found in root layout.".into()))
                 }
             }
 
         } else {
-            Err(CrimError::other("No such view found".into()))
+            Err(DeepCrowError::other("No such view found".into()))
         }
     }
 }
 
-fn exec<'a>(input: &StatefulContext<'a>, tokens: &Vec<Token>, buf: &mut String) -> CrimResult<()> {
+fn exec<'a>(input: &StatefulContext<'a>, tokens: &Vec<Token>, buf: &mut String) -> Result<()> {
     for token in tokens {
         match token {
             Token::Loop(ident,code) => {
@@ -320,7 +320,7 @@ mod tests {
 
     #[test]
     fn parsing() {
-        let mut ct = Crimtag::new();
+        let mut ct = DeepCrow::new();
         if let Err(e) = ct.load_static(r#"Here is a sample
 [|view "index" theme="standard"|><html><body>Hi</body></html><|view|]
 That was fun! now a placeholder: [|view "placeholder"|] and now one with an implicit [|view "simple"|>Body -> [|show content|] <- and end<|view|] aoeu
@@ -360,8 +360,8 @@ Now with explicit outputs:
     }
 
     #[test]
-    fn loops() -> Result<(),CrimError> {
-        let mut ct = Crimtag::new();
+    fn loops() -> Result<()> {
+        let mut ct = DeepCrow::new();
         ct.load_static(r#"Looping code:
 [|view "index"|>We will enumerate people here:[|loop people|>
  - [|show last_name|], [|show first_name|][|if show_title |>: [|show title|] <|else|> **title redacted** <|if|] ::>[|loop tags|> [|show tag|]<|loop|] <:: <|loop|]
@@ -419,8 +419,8 @@ Now with explicit outputs:
     }
 
     #[test]
-    fn conditional() -> Result<(),CrimError> {
-        let mut ct = Crimtag::new();
+    fn conditional() -> Result<()> {
+        let mut ct = DeepCrow::new();
         ct.load_static(r#"Hi there
 [|view "index"|>
     Color: [|if is_red|> red <|elif is_blue |> blue <|else|> green <|if|]
@@ -525,7 +525,7 @@ Now with explicit outputs:
     }
     
     #[test]
-    fn custom() -> Result<(), CrimError> {
+    fn custom() -> Result<()> {
         let page = Page::new();
 
         println!("{:?}",