fixed clippy; updated depdendencies

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "raui"
-version = "0.64.0"
+version = "0.64.1"
 authors = ["Patryk 'PsichiX' Budzynski <[email protected]>"]
 edition = "2021"
 description = "Renderer Agnostic User Interface"

demos/in-game/src/model/inventory.rs

@@ -74,7 +74,7 @@ impl Inventory {
     pub fn owned<'a>(
         &'a self,
         database: &'a ItemsDatabase,
-    ) -> impl Iterator<Item = (&str, usize, &Item)> {
+    ) -> impl Iterator<Item = (&'a str, usize, &'a Item)> {
         self.owned
             .iter()
             .filter_map(|(id, count)| Some((id.as_str(), *count, database.items.get(id)?)))

examples/context_box.rs

@@ -28,7 +28,7 @@ fn app(mut ctx: WidgetContext) -> WidgetNode {
 
     make_widget!(content_box)
         .idref(idref.clone())
-        .with_shared_props(PortalsContainer(idref.into()))
+        .with_shared_props(PortalsContainer(idref))
         .listed_slot(
             make_widget!(horizontal_box)
                 .with_props(HorizontalBoxProps {

examples/immediate_mode_stack_props.rs

@@ -77,5 +77,5 @@ mod gui {
 }
 
 fn main() {
-    ImmediateApp::simple("Immediate mode UI - Stack props", || gui::app());
+    ImmediateApp::simple("Immediate mode UI - Stack props", gui::app);
 }

examples/options_view.rs

@@ -32,7 +32,7 @@ fn app(mut ctx: WidgetContext) -> WidgetNode {
     // for option views to anchor thier content into.
     make_widget!(content_box)
         .idref(idref.clone())
-        .with_shared_props(PortalsContainer(idref.into()))
+        .with_shared_props(PortalsContainer(idref))
         .listed_slot(
             // Options view is basically a button that toggles its content anchored
             // to itself. You can think of dropdown/context menus, but actually it

examples/options_view_map.rs

@@ -32,7 +32,7 @@ fn app(mut ctx: WidgetContext) -> WidgetNode {
 
     make_widget!(content_box)
         .idref(idref.clone())
-        .with_shared_props(PortalsContainer(idref.into()))
+        .with_shared_props(PortalsContainer(idref))
         .listed_slot(
             make_widget!(options_view)
                 .with_props(ContentBoxItemLayout {

examples/portal_box.rs

@@ -13,7 +13,7 @@ fn app(mut ctx: WidgetContext) -> WidgetNode {
         .idref(idref.clone())
         // widget rederence marked as portals container and put into root shared props for any
         // portal box down the widget tree. More about how portal box works later.
-        .with_shared_props(PortalsContainer(idref.to_owned().into()))
+        .with_shared_props(PortalsContainer(idref.to_owned()))
         .listed_slot(
             make_widget!(anchor_box)
                 .with_props(RelativeLayoutProps {

examples/retained_mode.rs

@@ -250,5 +250,5 @@ fn create_app(notifier: ChangeNotifier) -> View<AppView> {
 }
 
 fn main() {
-    RetainedApp::simple("Retained mode UI", |notifier| create_app(notifier));
+    RetainedApp::simple("Retained mode UI", create_app);
 }

examples/setup.rs

@@ -33,8 +33,8 @@ fn main() {
     // tree.
     application.apply(tree);
 
-    // This and the following function calls would need to be called every frame
-    loop {
+    // This scope content would need to be called every frame
+    {
         // Telling the app to `process` will make it perform any necessary updates.
         application.process();
 
@@ -73,8 +73,5 @@ fn main() {
                 .render::<_, String, _>(&mapping, &mut renderer)
                 .unwrap()
         );
-
-        // Let's not actually loop infinitely for this example
-        break;
     }
 }

examples/tooltip_box.rs

@@ -12,7 +12,7 @@ fn app(mut ctx: WidgetContext) -> WidgetNode {
 
     make_widget!(content_box)
         .idref(idref.clone())
-        .with_shared_props(PortalsContainer(idref.into()))
+        .with_shared_props(PortalsContainer(idref))
         .listed_slot(
             make_widget!(horizontal_box)
                 .with_props(HorizontalBoxProps {

raui-app/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "raui-app"
-version = "0.64.0"
+version = "0.64.1"
 authors = ["Patryk 'PsichiX' Budzynski <[email protected]>"]
 edition = "2021"
 description = "RAUI application layer to focus only on making UI"

raui-app/src/lib.rs

@@ -109,7 +109,7 @@ pub(crate) struct TesselateToGraphics<'a> {
     projection_view_matrix: [f32; 16],
 }
 
-impl<'a> TesselateBatchConverter<GraphicsBatch> for TesselateToGraphics<'a> {
+impl TesselateBatchConverter<GraphicsBatch> for TesselateToGraphics<'_> {
     fn convert(&mut self, batch: TesselateBatch) -> Option<GraphicsBatch> {
         match batch {
             TesselateBatch::Color => Some(GraphicsBatch {

raui-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "raui-core"
-version = "0.64.0"
+version = "0.64.1"
 authors = ["Patryk 'PsichiX' Budzynski <[email protected]>"]
 edition = "2021"
 description = "RAUI application layer"
@@ -14,4 +14,4 @@ categories = ["gui", "rendering::graphics-api"]
 raui-derive = { version = "0.64", path = "../raui-derive" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1.0"
-intuicio-data = "0.33"
+intuicio-data = "0.39"

raui-core/src/layout/mod.rs

@@ -27,7 +27,7 @@ impl<'a> LayoutSortedItems<'a> {
     }
 }
 
-impl<'a> std::fmt::Debug for LayoutSortedItems<'a> {
+impl std::fmt::Debug for LayoutSortedItems<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_map()
             .entries(self.0.iter().map(|&(k, v)| (k, v)))

raui-core/src/view_model.rs

@@ -423,7 +423,7 @@ pub struct ViewModelObject<'a, T> {
     notifier: ViewModelNotifier,
 }
 
-impl<'a, T> ViewModelObject<'a, T> {
+impl<T> ViewModelObject<'_, T> {
     pub fn set_unique_notify(&mut self, value: T)
     where
         T: PartialEq,
@@ -435,15 +435,15 @@ impl<'a, T> ViewModelObject<'a, T> {
     }
 }
 
-impl<'a, T> Deref for ViewModelObject<'a, T> {
+impl<T> Deref for ViewModelObject<'_, T> {
     type Target = T;
 
     fn deref(&self) -> &Self::Target {
         &self.access
     }
 }
 
-impl<'a, T> DerefMut for ViewModelObject<'a, T> {
+impl<T> DerefMut for ViewModelObject<'_, T> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         self.notifier.notify();
         &mut self.access
@@ -534,9 +534,9 @@ mod tests {
         collection.insert(FOO_VIEW_MODEL.to_owned(), view_model);
 
         // unbound properties won't trigger notification until we bind widgets to them.
-        assert_eq!(collection.consume_notified_common_root().is_valid(), false);
+        assert!(!collection.consume_notified_common_root().is_valid());
         handle.write().unwrap().toggle();
-        assert_eq!(collection.consume_notified_common_root().is_valid(), false);
+        assert!(!collection.consume_notified_common_root().is_valid());
         assert!(collection
             .get_mut(FOO_VIEW_MODEL)
             .unwrap()

raui-core/src/widget/context.rs

@@ -23,7 +23,7 @@ pub struct WidgetContext<'a> {
     pub view_models: ViewModelCollectionView<'a>,
 }
 
-impl<'a> WidgetContext<'a> {
+impl WidgetContext<'_> {
     pub fn take_named_slots(&mut self) -> HashMap<String, WidgetNode> {
         std::mem::take(&mut self.named_slots)
     }
@@ -45,7 +45,7 @@ impl<'a> WidgetContext<'a> {
     }
 }
 
-impl<'a> std::fmt::Debug for WidgetContext<'a> {
+impl std::fmt::Debug for WidgetContext<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("WidgetContext")
             .field("id", &self.id)

raui-core/src/widget/mod.rs

@@ -41,7 +41,7 @@ pub struct WidgetIdMetaParam<'a> {
     pub value: Option<&'a str>,
 }
 
-impl<'a> WidgetIdMetaParam<'a> {
+impl WidgetIdMetaParam<'_> {
     pub fn is_flag(&self) -> bool {
         self.value.is_none()
     }
@@ -1098,52 +1098,52 @@ mod tests {
         let a = WidgetId::from_str("a:root/a/b/c").unwrap();
         let b = WidgetId::from_str("b:root/a/b/c").unwrap();
         assert_eq!(a.distance_to(&b), Ok(0));
-        assert_eq!(a.is_subset_of(&b), false);
-        assert_eq!(a.is_superset_of(&b), false);
+        assert!(!a.is_subset_of(&b));
+        assert!(!a.is_superset_of(&b));
         let a = WidgetId::from_str("a:root/a/b").unwrap();
         let b = WidgetId::from_str("b:root/a/b/c").unwrap();
         assert_eq!(a.distance_to(&b), Ok(-1));
-        assert_eq!(a.is_subset_of(&b), true);
-        assert_eq!(a.is_superset_of(&b), false);
+        assert!(a.is_subset_of(&b));
+        assert!(!a.is_superset_of(&b));
         let a = WidgetId::from_str("a:root/a").unwrap();
         let b = WidgetId::from_str("b:root/a/b/c").unwrap();
         assert_eq!(a.distance_to(&b), Ok(-2));
-        assert_eq!(a.is_subset_of(&b), true);
-        assert_eq!(a.is_superset_of(&b), false);
+        assert!(a.is_subset_of(&b));
+        assert!(!a.is_superset_of(&b));
         let a = WidgetId::from_str("a:root").unwrap();
         let b = WidgetId::from_str("b:root/a/b/c").unwrap();
         assert_eq!(a.distance_to(&b), Ok(-3));
-        assert_eq!(a.is_subset_of(&b), true);
-        assert_eq!(a.is_superset_of(&b), false);
+        assert!(a.is_subset_of(&b));
+        assert!(!a.is_superset_of(&b));
         let a = WidgetId::from_str("a:root/a/b/c").unwrap();
         let b = WidgetId::from_str("b:root/a/b").unwrap();
         assert_eq!(a.distance_to(&b), Ok(1));
-        assert_eq!(a.is_subset_of(&b), false);
-        assert_eq!(a.is_superset_of(&b), true);
+        assert!(!a.is_subset_of(&b));
+        assert!(a.is_superset_of(&b));
         let a = WidgetId::from_str("a:root/a/b/c").unwrap();
         let b = WidgetId::from_str("b:root/a").unwrap();
         assert_eq!(a.distance_to(&b), Ok(2));
-        assert_eq!(a.is_subset_of(&b), false);
-        assert_eq!(a.is_superset_of(&b), true);
+        assert!(!a.is_subset_of(&b));
+        assert!(a.is_superset_of(&b));
         let a = WidgetId::from_str("a:root/a/b/c").unwrap();
         let b = WidgetId::from_str("b:root").unwrap();
         assert_eq!(a.distance_to(&b), Ok(3));
-        assert_eq!(a.is_subset_of(&b), false);
-        assert_eq!(a.is_superset_of(&b), true);
+        assert!(!a.is_subset_of(&b));
+        assert!(a.is_superset_of(&b));
         let a = WidgetId::from_str("a:root/a/b/x").unwrap();
         let b = WidgetId::from_str("b:root/a/b/c").unwrap();
         assert_eq!(a.distance_to(&b), Err(-1));
-        assert_eq!(a.is_subset_of(&b), false);
-        assert_eq!(a.is_superset_of(&b), false);
+        assert!(!a.is_subset_of(&b));
+        assert!(!a.is_superset_of(&b));
         let a = WidgetId::from_str("a:root/a/x/y").unwrap();
         let b = WidgetId::from_str("b:root/a/b/c").unwrap();
         assert_eq!(a.distance_to(&b), Err(-2));
-        assert_eq!(a.is_subset_of(&b), false);
-        assert_eq!(a.is_superset_of(&b), false);
+        assert!(!a.is_subset_of(&b));
+        assert!(!a.is_superset_of(&b));
         let a = WidgetId::from_str("a:root/x/y/z").unwrap();
         let b = WidgetId::from_str("b:root/a/b/c").unwrap();
         assert_eq!(a.distance_to(&b), Err(-3));
-        assert_eq!(a.is_subset_of(&b), false);
-        assert_eq!(a.is_superset_of(&b), false);
+        assert!(!a.is_subset_of(&b));
+        assert!(!a.is_superset_of(&b));
     }
 }

raui-derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "raui-derive"
-version = "0.64.0"
+version = "0.64.1"
 authors = ["Patryk 'PsichiX' Budzynski <[email protected]>"]
 edition = "2021"
 description = "Macros for Renderer Agnostic User Interface"

raui-immediate-widgets/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "raui-immediate-widgets"
-version = "0.64.0"
+version = "0.64.1"
 authors = ["Patryk 'PsichiX' Budzynski <[email protected]>"]
 edition = "2021"
 description = "Widgets library for RAUI immediate mode UI layer"

raui-immediate/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "raui-immediate"
-version = "0.64.0"
+version = "0.64.1"
 authors = ["Patryk 'PsichiX' Budzynski <[email protected]>"]
 edition = "2021"
 description = "RAUI immediate mode UI layer"

raui-immediate/src/lib.rs

@@ -487,7 +487,7 @@ mod tests {
     }
 
     fn text_field() {
-        let text = use_state(|| String::default());
+        let text = use_state(String::default);
         let mut text = text.write().unwrap();
 
         text.push('z');

raui-json-renderer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "raui-json-renderer"
-version = "0.64.0"
+version = "0.64.1"
 authors = ["Patryk 'PsichiX' Budzynski <[email protected]>"]
 edition = "2021"
 description = "RAUI renderer for JSON format"

raui-material/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "raui-material"
-version = "0.64.0"
+version = "0.64.1"
 authors = ["Patryk 'PsichiX' Budzynski <[email protected]>"]
 edition = "2021"
 description = "Material components library for RAUI"

raui-retained/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "raui-retained"
-version = "0.64.0"
+version = "0.64.1"
 authors = ["Patryk 'PsichiX' Budzynski <[email protected]>"]
 edition = "2021"
 description = "RAUI retained mode UI layer"

raui-tesselate-renderer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "raui-tesselate-renderer"
-version = "0.64.0"
+version = "0.64.1"
 authors = ["Patryk 'PsichiX' Budzynski <[email protected]>"]
 edition = "2021"
 description = "RAUI renderer that tesselates layout into vertex and index buffers"

raui-tesselate-renderer/src/lib.rs

@@ -730,7 +730,7 @@ where
     }
 }
 
-impl<'a, V, B, P, C> Renderer<(), Error> for TesselateRenderer<'a, V, B, P, C>
+impl<V, B, P, C> Renderer<(), Error> for TesselateRenderer<'_, V, B, P, C>
 where
     V: TesselateVertex + TextVertex<Color> + Default,
     B: PartialEq,