From f8a232c8af4c50557fbf0c2e0b2ba46fb63f6adc Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 22 Oct 2019 23:20:24 +0200
Subject: Remove generic handle in `Image`

For now, we will simply assume images will be loaded from a given path.
---
 native/src/widget/image.rs | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'native/src/widget')

diff --git a/native/src/widget/image.rs b/native/src/widget/image.rs
index 178dd709..6255a7b5 100644
--- a/native/src/widget/image.rs
+++ b/native/src/widget/image.rs
@@ -6,10 +6,9 @@ use std::hash::Hash;
 
 pub use iced_core::Image;
 
-impl<I, Message, Renderer> Widget<Message, Renderer> for Image<I>
+impl<Message, Renderer> Widget<Message, Renderer> for Image
 where
-    Renderer: self::Renderer<I>,
-    I: Clone,
+    Renderer: self::Renderer,
 {
     fn node(&self, renderer: &Renderer) -> Node {
         renderer.node(&self)
@@ -38,27 +37,26 @@ where
 ///
 /// [`Image`]: struct.Image.html
 /// [renderer]: ../../renderer/index.html
-pub trait Renderer<I>: crate::Renderer {
+pub trait Renderer: crate::Renderer {
     /// Creates a [`Node`] for the provided [`Image`].
     ///
     /// You should probably keep the original aspect ratio, if possible.
     ///
     /// [`Node`]: ../../struct.Node.html
     /// [`Image`]: struct.Image.html
-    fn node(&self, image: &Image<I>) -> Node;
+    fn node(&self, image: &Image) -> Node;
 
     /// Draws an [`Image`].
     ///
     /// [`Image`]: struct.Image.html
-    fn draw(&mut self, image: &Image<I>, layout: Layout<'_>) -> Self::Output;
+    fn draw(&mut self, image: &Image, layout: Layout<'_>) -> Self::Output;
 }
 
-impl<'a, I, Message, Renderer> From<Image<I>> for Element<'a, Message, Renderer>
+impl<'a, Message, Renderer> From<Image> for Element<'a, Message, Renderer>
 where
-    Renderer: self::Renderer<I>,
-    I: Clone + 'a,
+    Renderer: self::Renderer,
 {
-    fn from(image: Image<I>) -> Element<'a, Message, Renderer> {
+    fn from(image: Image) -> Element<'a, Message, Renderer> {
         Element::new(image)
     }
 }
-- 
cgit