diff options
Diffstat (limited to 'pure/src')
| -rw-r--r-- | pure/src/lib.rs | 6 | ||||
| -rw-r--r-- | pure/src/widget.rs | 4 | ||||
| -rw-r--r-- | pure/src/widget/button.rs | 12 | ||||
| -rw-r--r-- | pure/src/widget/checkbox.rs | 8 | ||||
| -rw-r--r-- | pure/src/widget/column.rs | 18 | ||||
| -rw-r--r-- | pure/src/widget/container.rs | 18 | ||||
| -rw-r--r-- | pure/src/widget/element.rs | 6 | ||||
| -rw-r--r-- | pure/src/widget/image.rs | 8 | ||||
| -rw-r--r-- | pure/src/widget/pick_list.rs | 13 | ||||
| -rw-r--r-- | pure/src/widget/radio.rs | 8 | ||||
| -rw-r--r-- | pure/src/widget/row.rs | 17 | ||||
| -rw-r--r-- | pure/src/widget/scrollable.rs | 10 | ||||
| -rw-r--r-- | pure/src/widget/slider.rs | 8 | ||||
| -rw-r--r-- | pure/src/widget/space.rs | 8 | ||||
| -rw-r--r-- | pure/src/widget/text.rs | 8 | ||||
| -rw-r--r-- | pure/src/widget/text_input.rs | 8 | ||||
| -rw-r--r-- | pure/src/widget/toggler.rs | 8 | 
17 files changed, 17 insertions, 151 deletions
diff --git a/pure/src/lib.rs b/pure/src/lib.rs index bab3bbc7..1b51d55b 100644 --- a/pure/src/lib.rs +++ b/pure/src/lib.rs @@ -9,7 +9,7 @@ use iced_native::event::{self, Event};  use iced_native::layout::{self, Layout};  use iced_native::mouse;  use iced_native::renderer; -use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell}; +use iced_native::{Clipboard, Length, Point, Rectangle, Shell};  pub struct Pure<'a, Message, Renderer> {      state: &'a mut State, @@ -65,10 +65,6 @@ where          self.element.as_widget().height()      } -    fn hash_layout(&self, state: &mut Hasher) { -        self.element.as_widget().hash_layout(state) -    } -      fn layout(          &self,          renderer: &Renderer, diff --git a/pure/src/widget.rs b/pure/src/widget.rs index a12d6fad..c516c1f2 100644 --- a/pure/src/widget.rs +++ b/pure/src/widget.rs @@ -38,7 +38,7 @@ use iced_native::layout::{self, Layout};  use iced_native::mouse;  use iced_native::overlay;  use iced_native::renderer; -use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell}; +use iced_native::{Clipboard, Length, Point, Rectangle, Shell};  use std::borrow::Cow; @@ -47,8 +47,6 @@ pub trait Widget<Message, Renderer> {      fn height(&self) -> Length; -    fn hash_layout(&self, state: &mut Hasher); -      fn layout(          &self,          renderer: &Renderer, diff --git a/pure/src/widget/button.rs b/pure/src/widget/button.rs index 2ed67a9c..4380b608 100644 --- a/pure/src/widget/button.rs +++ b/pure/src/widget/button.rs @@ -8,7 +8,7 @@ use iced_native::mouse;  use iced_native::renderer;  use iced_native::widget::button;  use iced_native::{ -    Clipboard, Hasher, Layout, Length, Padding, Point, Rectangle, Shell, +    Clipboard, Layout, Length, Padding, Point, Rectangle, Shell,  };  use iced_style::button::StyleSheet; @@ -101,16 +101,6 @@ where          self.height      } -    fn hash_layout(&self, state: &mut Hasher) { -        use std::hash::Hash; - -        self.tag().hash(state); -        self.width.hash(state); -        self.height.hash(state); -        self.padding.hash(state); -        self.content.as_widget().hash_layout(state); -    } -      fn layout(          &self,          renderer: &Renderer, diff --git a/pure/src/widget/checkbox.rs b/pure/src/widget/checkbox.rs index 8aa4e845..3448e616 100644 --- a/pure/src/widget/checkbox.rs +++ b/pure/src/widget/checkbox.rs @@ -5,7 +5,7 @@ use iced_native::layout::{self, Layout};  use iced_native::mouse;  use iced_native::renderer;  use iced_native::text; -use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell}; +use iced_native::{Clipboard, Length, Point, Rectangle, Shell};  pub use iced_native::widget::Checkbox; @@ -88,12 +88,6 @@ where              renderer,          )      } - -    fn hash_layout(&self, state: &mut Hasher) { -        <Self as iced_native::Widget<Message, Renderer>>::hash_layout( -            self, state, -        ) -    }  }  impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> diff --git a/pure/src/widget/column.rs b/pure/src/widget/column.rs index 698d7e9c..37ff96c5 100644 --- a/pure/src/widget/column.rs +++ b/pure/src/widget/column.rs @@ -7,7 +7,7 @@ use iced_native::layout::{self, Layout};  use iced_native::mouse;  use iced_native::renderer;  use iced_native::{ -    Alignment, Clipboard, Hasher, Length, Padding, Point, Rectangle, Shell, +    Alignment, Clipboard, Length, Padding, Point, Rectangle, Shell,  };  use std::u32; @@ -202,22 +202,6 @@ where          }      } -    fn hash_layout(&self, state: &mut Hasher) { -        use std::hash::Hash; - -        self.tag().hash(state); -        self.width.hash(state); -        self.height.hash(state); -        self.max_width.hash(state); -        self.align_items.hash(state); -        self.spacing.hash(state); -        self.padding.hash(state); - -        for child in &self.children { -            child.as_widget().hash_layout(state); -        } -    } -      fn overlay<'b>(          &'b self,          tree: &'b mut Tree, diff --git a/pure/src/widget/container.rs b/pure/src/widget/container.rs index c8f0b3a2..ebf69cab 100644 --- a/pure/src/widget/container.rs +++ b/pure/src/widget/container.rs @@ -9,10 +9,9 @@ use iced_native::overlay;  use iced_native::renderer;  use iced_native::widget::container;  use iced_native::{ -    Clipboard, Hasher, Layout, Length, Padding, Point, Rectangle, Shell, +    Clipboard, Layout, Length, Padding, Point, Rectangle, Shell,  }; -use std::hash::Hash;  use std::u32;  pub use iced_style::container::{Style, StyleSheet}; @@ -224,21 +223,6 @@ where          );      } -    fn hash_layout(&self, state: &mut Hasher) { -        struct Marker; -        std::any::TypeId::of::<Marker>().hash(state); - -        self.padding.hash(state); -        self.width.hash(state); -        self.height.hash(state); -        self.max_width.hash(state); -        self.max_height.hash(state); -        self.horizontal_alignment.hash(state); -        self.vertical_alignment.hash(state); - -        self.content.as_widget().hash_layout(state); -    } -      fn overlay<'b>(          &'b self,          tree: &'b mut Tree, diff --git a/pure/src/widget/element.rs b/pure/src/widget/element.rs index d905b924..3d5697fe 100644 --- a/pure/src/widget/element.rs +++ b/pure/src/widget/element.rs @@ -5,7 +5,7 @@ use iced_native::event::{self, Event};  use iced_native::layout::{self, Layout};  use iced_native::mouse;  use iced_native::renderer; -use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell}; +use iced_native::{Clipboard, Length, Point, Rectangle, Shell};  pub struct Element<'a, Message, Renderer> {      widget: Box<dyn Widget<Message, Renderer> + 'a>, @@ -160,8 +160,4 @@ where              renderer,          )      } - -    fn hash_layout(&self, state: &mut Hasher) { -        self.widget.hash_layout(state); -    }  } diff --git a/pure/src/widget/image.rs b/pure/src/widget/image.rs index ce807813..a5bca5a0 100644 --- a/pure/src/widget/image.rs +++ b/pure/src/widget/image.rs @@ -4,7 +4,7 @@ use crate::Element;  use iced_native::layout::{self, Layout};  use iced_native::renderer;  use iced_native::widget::image; -use iced_native::{Hasher, Length, Point, Rectangle}; +use iced_native::{Length, Point, Rectangle};  use std::hash::Hash; @@ -51,12 +51,6 @@ where              viewport,          )      } - -    fn hash_layout(&self, state: &mut Hasher) { -        <Self as iced_native::Widget<Message, Renderer>>::hash_layout( -            self, state, -        ) -    }  }  impl<'a, Message, Renderer, Handle> Into<Element<'a, Message, Renderer>> diff --git a/pure/src/widget/pick_list.rs b/pure/src/widget/pick_list.rs index 9dc847ee..9573f27a 100644 --- a/pure/src/widget/pick_list.rs +++ b/pure/src/widget/pick_list.rs @@ -10,7 +10,7 @@ use iced_native::renderer;  use iced_native::text;  use iced_native::widget::pick_list;  use iced_native::{ -    Clipboard, Hasher, Layout, Length, Padding, Point, Rectangle, Shell, +    Clipboard, Layout, Length, Padding, Point, Rectangle, Shell,  };  use std::borrow::Cow; @@ -145,17 +145,6 @@ where          )      } -    fn hash_layout(&self, state: &mut Hasher) { -        pick_list::hash_layout( -            state, -            self.width, -            self.padding, -            self.text_size, -            self.placeholder.as_ref().map(String::as_str), -            &self.options, -        ) -    } -      fn on_event(          &mut self,          tree: &mut Tree, diff --git a/pure/src/widget/radio.rs b/pure/src/widget/radio.rs index 233297b3..ce3ede84 100644 --- a/pure/src/widget/radio.rs +++ b/pure/src/widget/radio.rs @@ -5,7 +5,7 @@ use iced_native::layout::{self, Layout};  use iced_native::mouse;  use iced_native::renderer;  use iced_native::text; -use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell}; +use iced_native::{Clipboard, Length, Point, Rectangle, Shell};  pub use iced_native::widget::Radio; @@ -89,12 +89,6 @@ where              renderer,          )      } - -    fn hash_layout(&self, state: &mut Hasher) { -        <Self as iced_native::Widget<Message, Renderer>>::hash_layout( -            self, state, -        ) -    }  }  impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> diff --git a/pure/src/widget/row.rs b/pure/src/widget/row.rs index 1c574d51..fa0efa68 100644 --- a/pure/src/widget/row.rs +++ b/pure/src/widget/row.rs @@ -7,7 +7,7 @@ use iced_native::layout::{self, Layout};  use iced_native::mouse;  use iced_native::renderer;  use iced_native::{ -    Alignment, Clipboard, Hasher, Length, Padding, Point, Rectangle, Shell, +    Alignment, Clipboard, Length, Padding, Point, Rectangle, Shell,  };  pub struct Row<'a, Message, Renderer> { @@ -189,21 +189,6 @@ where          }      } -    fn hash_layout(&self, state: &mut Hasher) { -        use std::hash::Hash; - -        self.tag().hash(state); -        self.width.hash(state); -        self.height.hash(state); -        self.align_items.hash(state); -        self.spacing.hash(state); -        self.padding.hash(state); - -        for child in &self.children { -            child.as_widget().hash_layout(state); -        } -    } -      fn overlay<'b>(          &'b self,          tree: &'b mut Tree, diff --git a/pure/src/widget/scrollable.rs b/pure/src/widget/scrollable.rs index bbda50e5..1548fa9d 100644 --- a/pure/src/widget/scrollable.rs +++ b/pure/src/widget/scrollable.rs @@ -7,7 +7,7 @@ use iced_native::layout::{self, Layout};  use iced_native::mouse;  use iced_native::renderer;  use iced_native::widget::scrollable; -use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell, Vector}; +use iced_native::{Clipboard, Length, Point, Rectangle, Shell, Vector};  pub use iced_style::scrollable::StyleSheet; @@ -115,14 +115,6 @@ where          self.height      } -    fn hash_layout(&self, state: &mut Hasher) { -        use std::hash::Hash; - -        self.tag().hash(state); -        self.height.hash(state); -        self.content.as_widget().hash_layout(state) -    } -      fn layout(          &self,          renderer: &Renderer, diff --git a/pure/src/widget/slider.rs b/pure/src/widget/slider.rs index 691d3f18..1107bdc1 100644 --- a/pure/src/widget/slider.rs +++ b/pure/src/widget/slider.rs @@ -9,9 +9,7 @@ use iced_native::layout;  use iced_native::mouse;  use iced_native::renderer;  use iced_native::widget::slider; -use iced_native::{ -    Clipboard, Hasher, Layout, Length, Point, Rectangle, Shell, Size, -}; +use iced_native::{Clipboard, Layout, Length, Point, Rectangle, Shell, Size};  use std::ops::RangeInclusive; @@ -230,10 +228,6 @@ where              tree.state.downcast_ref::<slider::State>(),          )      } - -    fn hash_layout(&self, state: &mut Hasher) { -        slider::hash_layout(state, self.width) -    }  }  impl<'a, T, Message, Renderer> From<Slider<'a, T, Message>> diff --git a/pure/src/widget/space.rs b/pure/src/widget/space.rs index e0c9c285..c04d962a 100644 --- a/pure/src/widget/space.rs +++ b/pure/src/widget/space.rs @@ -4,7 +4,7 @@ use iced_native::event::{self, Event};  use iced_native::layout::{self, Layout};  use iced_native::mouse;  use iced_native::renderer; -use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell}; +use iced_native::{Clipboard, Length, Point, Rectangle, Shell};  pub use iced_native::widget::Space; @@ -86,12 +86,6 @@ where              renderer,          )      } - -    fn hash_layout(&self, state: &mut Hasher) { -        <Self as iced_native::Widget<Message, Renderer>>::hash_layout( -            self, state, -        ) -    }  }  impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> for Space diff --git a/pure/src/widget/text.rs b/pure/src/widget/text.rs index 696d0ae1..bfcbaa4b 100644 --- a/pure/src/widget/text.rs +++ b/pure/src/widget/text.rs @@ -3,7 +3,7 @@ use crate::{Element, Tree, Widget};  use iced_native::layout::{self, Layout};  use iced_native::renderer;  use iced_native::text; -use iced_native::{Hasher, Length, Point, Rectangle}; +use iced_native::{Length, Point, Rectangle};  pub use iced_native::widget::Text; @@ -47,12 +47,6 @@ where              viewport,          )      } - -    fn hash_layout(&self, state: &mut Hasher) { -        <Self as iced_native::Widget<Message, Renderer>>::hash_layout( -            self, state, -        ) -    }  }  impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> diff --git a/pure/src/widget/text_input.rs b/pure/src/widget/text_input.rs index 40ce140c..dec11164 100644 --- a/pure/src/widget/text_input.rs +++ b/pure/src/widget/text_input.rs @@ -7,9 +7,7 @@ use iced_native::mouse;  use iced_native::renderer;  use iced_native::text;  use iced_native::widget::text_input; -use iced_native::{ -    Clipboard, Hasher, Length, Padding, Point, Rectangle, Shell, -}; +use iced_native::{Clipboard, Length, Padding, Point, Rectangle, Shell};  pub use iced_style::text_input::StyleSheet; @@ -153,10 +151,6 @@ where          Length::Shrink      } -    fn hash_layout(&self, state: &mut Hasher) { -        text_input::hash_layout(state, self.width, self.padding, self.size); -    } -      fn layout(          &self,          renderer: &Renderer, diff --git a/pure/src/widget/toggler.rs b/pure/src/widget/toggler.rs index 08619866..1b3367a4 100644 --- a/pure/src/widget/toggler.rs +++ b/pure/src/widget/toggler.rs @@ -6,7 +6,7 @@ use iced_native::layout::{self, Layout};  use iced_native::mouse;  use iced_native::renderer;  use iced_native::text; -use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell}; +use iced_native::{Clipboard, Length, Point, Rectangle, Shell};  pub use iced_native::widget::toggler::{Style, StyleSheet, Toggler}; @@ -23,12 +23,6 @@ where          <Self as iced_native::Widget<Message, Renderer>>::height(self)      } -    fn hash_layout(&self, state: &mut Hasher) { -        <Self as iced_native::Widget<Message, Renderer>>::hash_layout( -            self, state, -        ) -    } -      fn layout(          &self,          renderer: &Renderer,  | 
