read explicit lifetime to FromDsl

output/src/output.rs

@@ -29,8 +29,8 @@ pub trait Render<E: Output> {
     /// Write data to display.
     fn render (&self, output: &mut E);
     /// Perform type erasure, turning `self` into an opaque [RenderBox].
-    fn boxed <'a> (self) -> RenderBox<'a, E> where Self: Send + Sync + Sized + 'a {
-        Box::new(self) as RenderBox<'a, E>
+    fn boxed <'a> (self) -> Box<dyn Render<E> + 'a> where Self: Sized + 'a {
+        Box::new(self) as Box<dyn Render<E> + 'a>
     }
 }
 
@@ -47,20 +47,20 @@ impl<E: Output, C: Content<E>> Render<E> for C {
 /// Opaque pointer to a renderable living on the heap.
 ///
 /// Return this from [Content::content] to use dynamic dispatch.
-pub type RenderBox<'a, E> = Box<RenderDyn<'a, E>>;
+pub type RenderBox<E> = Box<RenderDyn<E>>;
 
 /// You can render from a box.
-impl<'a, E: Output> Content<E> for RenderBox<'a, E> {
-    fn content (&self) -> impl Render<E> { self.deref() }
+impl<E: Output> Content<E> for RenderBox<E> {
+    fn content (&self) -> impl Render<E> + '_ { self.deref() }
     //fn boxed <'b> (self) -> RenderBox<'b, E> where Self: Sized + 'b { self }
 }
 
 /// Opaque pointer to a renderable.
-pub type RenderDyn<'a, E> = dyn Render<E> + Send + Sync + 'a;
+pub type RenderDyn<E> = dyn Render<E>;
 
 /// You can render from an opaque pointer.
-impl<'a, E: Output> Content<E> for &RenderDyn<'a, E> where Self: Sized {
-    fn content (&self) -> impl Render<E> {
+impl<E: Output> Content<E> for &RenderDyn<E> where Self: Sized {
+    fn content (&self) -> impl Render<E> + '_ {
         #[allow(suspicious_double_ref_op)]
         self.deref()
     }
@@ -77,7 +77,7 @@ impl<'a, E: Output> Content<E> for &RenderDyn<'a, E> where Self: Sized {
 /// Composable renderable with static dispatch.
 pub trait Content<E: Output> {
     /// Return a [Render]able of a specific type.
-    fn content (&self) -> impl Render<E> { () }
+    fn content (&self) -> impl Render<E> + '_ { () }
     /// Perform layout. By default, delegates to [Self::content].
     fn layout (&self, area: E::Area) -> E::Area { self.content().layout(area) }
     /// Draw to output. By default, delegates to [Self::content].
@@ -86,7 +86,7 @@ pub trait Content<E: Output> {
 
 /// Every pointer to [Content] is a [Content].
 impl<E: Output, C: Content<E>> Content<E> for &C {
-    fn content (&self) -> impl Render<E> { (*self).content() }
+    fn content (&self) -> impl Render<E> + '_ { (*self).content() }
     fn layout (&self, area: E::Area) -> E::Area { (*self).layout(area) }
     fn render (&self, output: &mut E) { (*self).render(output) }
 }
@@ -98,7 +98,7 @@ impl<E: Output> Content<E> for () {
 }
 
 impl<E: Output, T: Content<E>> Content<E> for Option<T> {
-    fn content (&self) -> impl Render<E> {
+    fn content (&self) -> impl Render<E> + '_ {
         self.as_ref()
     }
     fn layout (&self, area: E::Area) -> E::Area {
@@ -117,7 +117,7 @@ impl<E: Output, T: Content<E>> Content<E> for Option<T> {
     // Implement for all [Output]s.
     (|$self:ident:$Struct:ty| $content:expr) => {
         impl<E: Output> Content<E> for $Struct {
-            fn content (&$self) -> impl Render<E> { Some($content) }
+            fn content (&$self) -> impl Render<E> + '_ { Some($content) }
         }
     };
     // Implement for specific [Output].
@@ -127,7 +127,7 @@ impl<E: Output, T: Content<E>> Content<E> for Option<T> {
     |$content:expr) => {
         impl $(<$($($L)? $($T)? $(:$Trait)?),+>)? Content<$Output>
         for $Struct $(<$($($L)? $($T)?),+>)? {
-            fn content (&$self) -> impl Render<$Output> { $content }
+            fn content (&$self) -> impl Render<$Output> + '_ { $content }
         }
     };
 }