wip: examples for the edn rendering

edn/src/edn_layout.rs

@@ -1,20 +0,0 @@
-use crate::*;
-use std::marker::PhantomData;
-use ::tek_layout::{*, tek_engine::{Usually, Content, Render, Engine, Thunk}};
-use EdnItem::*;
-
-pub type EdnRender<'a, Engine> =
-    dyn Render<Engine> + Send + Sync + 'a;
-
-pub type EdnCallback<'a, Engine, State> =
-    dyn Fn(&'a State)->Box<EdnRender<'a, Engine>> + Send + Sync + 'a;
-
-pub type EdnRenderCallback<'a, Engine, State> =
-    Box<EdnCallback<'a, Engine, State>>;
-
-pub trait EdnLayout<'a, E: Engine + 'a> where Self: 'a {
-    fn get_bool    (&self,    _sym: &str) -> bool { false }
-    fn get_unit    (&self,    _sym: &str) -> E::Unit { 0.into() }
-    fn get_usize   (&self,    _sym: &str) -> usize { 0 }
-    fn get_content (&'a self, _sym: &str) -> Box<EdnRender<'a, E>> { Box::new(()) }
-}

edn/src/edn_view.rs

@@ -1,22 +1,40 @@
 use crate::*;
 use std::marker::PhantomData;
+use ::tek_layout::{*, tek_engine::{Usually, Content, Render, Engine, Thunk}};
+use EdnItem::*;
+
+pub type EdnRender<'a, Engine> =
+    dyn Render<Engine> + Send + Sync + 'a;
+
+pub type EdnCallback<'a, Engine, State> =
+    dyn Fn(&'a State)->Box<EdnRender<'a, Engine>> + Send + Sync + 'a;
+
+pub type EdnRenderCallback<'a, Engine, State> =
+    Box<EdnCallback<'a, Engine, State>>;
+
+pub trait EdnLayout<E: Engine> {
+    fn get_bool    (&self,    _sym: &str) -> bool { false }
+    fn get_unit    (&self,    _sym: &str) -> E::Unit { 0.into() }
+    fn get_usize   (&self,    _sym: &str) -> usize { 0 }
+    fn get_content <'a> (&'a self, _sym: &str) -> Box<EdnRender<'a, E>> { Box::new(()) }
+}
 
 /// Renders from EDN source and context.
-pub struct EdnView<'a, E: Engine + 'a, T: EdnLayout<'a, E> + 'a> {
-    _engine: PhantomData<&'a E>,
+pub struct EdnView<E: Engine, T: EdnLayout<E>> {
+    _engine: PhantomData<E>,
     context: T,
     layout:  EdnItem<String>
     //render: Box<dyn Fn(&'a T)->Box<dyn Render<E> + Send + Sync + 'a> + Send + Sync + 'a>
 }
 
-impl<'a, E: Engine + 'a, T: EdnLayout<'a, E> + 'a> EdnView<'a, E, T> {
-    pub fn new (context: T, source: &'a str) -> Usually<Self> {
+impl<E: Engine, T: EdnLayout<E>> EdnView<E, T> {
+    pub fn new (context: T, source: &str) -> Usually<Self> {
         let layout = EdnItem::read_one(&source)?.0;
         Ok(Self { _engine: Default::default(), context, layout, })
     }
 }
 
-impl<'a, E: Engine + 'a, T: EdnLayout<'a, E> + Send + Sync + 'a> Content<E> for EdnView<'a, E, T> {
+impl<E: Engine, T: EdnLayout<E> + Send + Sync> Content<E> for EdnView<E, T> {
     fn content (&self) -> impl Render<E> {
         use EdnItem::*;
         match &self.layout {

edn/src/lib.rs

@@ -11,7 +11,6 @@ pub(crate) use ::tek_layout::{
 
 mod edn_error;   pub use self::edn_error::*;
 mod edn_item;    pub use self::edn_item::*;
-mod edn_layout;  pub use self::edn_layout::*;
 mod edn_token;   pub use self::edn_token::*;
 mod edn_view;    pub use self::edn_view::*;