WIP - simplify lifetimes

core/embed/rust/src/ui/gdc_poc.rs

@@ -21,7 +21,7 @@ use crate::{
 
 const ICON_GOOGLE: &[u8] = include_res!("model_tt/res/fido/icon_google.toif");
 
-fn draw_component1<'a>(target: &mut impl Renderer<'a>) {
+fn draw_component1<'a>(target: &mut impl Renderer) {
     let r = Rect::from_top_left_and_size(Point::new(30, 120), Offset::new(180, 60));
     shape::Bar::new(r)
         .with_radius(16)
@@ -97,7 +97,7 @@ fn draw_component1<'a>(target: &mut impl Renderer<'a>) {
         .render(target);
 }
 
-fn draw_component2<'a>(target: &mut impl Renderer<'a>) {
+fn draw_component2(target: &mut impl Renderer) {
     let pt = Point::new(120, 110);
     shape::Circle::new(pt, 60)
         .with_bg(Color::rgb(80, 80, 80))
@@ -120,7 +120,7 @@ fn draw_component2<'a>(target: &mut impl Renderer<'a>) {
 
 const IMAGE_HOMESCREEN: &[u8] = include_res!("minion.jpg");
 
-fn draw_component3<'a>(target: &mut impl Renderer<'a>) {
+fn draw_component3(target: &mut impl Renderer) {
     shape::JpegImage::new(Point::new(0, 0), IMAGE_HOMESCREEN).render(target);
 }
 

core/embed/rust/src/ui/shape/bar.rs

@@ -52,7 +52,7 @@ impl Bar {
         Self { thickness, ..self }
     }
 
-    pub fn render<'a>(self, renderer: &mut impl Renderer<'a>) {
+    pub fn render<'a>(self, renderer: &mut impl Renderer) {
         renderer.render_shape(self);
     }
 }

core/embed/rust/src/ui/shape/blur.rs

@@ -18,7 +18,7 @@ impl Blurring {
         Self { area, radius }
     }
 
-    pub fn render<'a>(self, renderer: &mut impl Renderer<'a>) {
+    pub fn render<'a>(self, renderer: &mut impl Renderer) {
         renderer.render_shape(self);
     }
 }

core/embed/rust/src/ui/shape/circle.rs

@@ -51,7 +51,7 @@ impl Circle {
         }
     }
 
-    pub fn render<'a>(self, renderer: &mut impl Renderer<'a>) {
+    pub fn render(self, renderer: &mut impl Renderer) {
         renderer.render_shape(self);
     }
 }

core/embed/rust/src/ui/shape/jpeg.rs

@@ -29,7 +29,7 @@ impl JpegImage {
         }
     }
 
-    pub fn render<'b>(self, renderer: &mut impl Renderer<'b>) {
+    pub fn render(self, renderer: &mut impl Renderer) {
         renderer.render_shape(self);
     }
 }

core/embed/rust/src/ui/shape/render.rs

@@ -18,7 +18,7 @@ use without_alloc::{alloc::LocalAllocLeakExt, FixedVec};
 /// All renders must implement Renderer trait
 /// Renderers can immediately use the draw() method of the passed shape or
 /// may store it (using the boxed() method) and draw it later
-pub trait Renderer<'a> {
+pub trait Renderer {
     fn viewport(&self) -> Viewport;
 
     fn set_viewport(&mut self, viewport: Viewport);
@@ -76,7 +76,7 @@ impl<'can, 'ctx, 'alloc> DirectRenderer<'can, 'ctx, 'alloc> {
     }
 }
 
-impl<'can, 'ctx, 'alloc> Renderer<'alloc> for DirectRenderer<'can, 'ctx, 'alloc> {
+impl<'can, 'ctx, 'alloc> Renderer for DirectRenderer<'can, 'ctx, 'alloc> {
     fn viewport(&self) -> Viewport {
         self.canvas.viewport()
     }
@@ -193,7 +193,7 @@ where
     }
 }
 
-impl<'can, 'ctx, 'alloc, T> Renderer<'alloc> for ProgressiveRenderer<'can, 'ctx, 'alloc, T>
+impl<'can, 'ctx, 'alloc, T> Renderer for ProgressiveRenderer<'can, 'ctx, 'alloc, T>
 where
     T: LocalAllocLeakExt<'alloc>,
 {

core/embed/rust/src/ui/shape/text.rs

@@ -37,7 +37,7 @@ impl<'a> Text<'a> {
         Self { font, ..self }
     }
 
-    pub fn render<'b>(self, renderer: &mut impl Renderer<'b>) {
+    pub fn render<'b>(self, renderer: &mut impl Renderer) {
         renderer.render_shape(self);
     }
 }

core/embed/rust/src/ui/shape/toif.rs

@@ -46,7 +46,7 @@ impl ToifImage {
         }
     }
 
-    pub fn render<'b>(self, renderer: &mut impl Renderer<'b>) {
+    pub fn render<'b>(self, renderer: &mut impl Renderer) {
         renderer.render_shape(self);
     }