From f081ac1c314fe0a30c023eb4e2e1c230e4e26e31 Mon Sep 17 00:00:00 2001
From: Louis Capitanchik <contact@louiscap.co>
Date: Tue, 17 Jan 2023 20:25:55 +0000
Subject: [PATCH] Apply lints
---
src/components/a_text_box.rs | 13 +++++--------
src/components/button.rs | 8 ++++----
src/components/inset_icon.rs | 2 +-
src/components/panel.rs | 2 +-
4 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/components/a_text_box.rs b/src/components/a_text_box.rs
index 0ccf2b6..e8766ff 100644
--- a/src/components/a_text_box.rs
+++ b/src/components/a_text_box.rs
@@ -1,9 +1,7 @@
use bevy::prelude::*;
use kayak_font::{KayakFont, TextProperties};
use kayak_ui::prelude::*;
-use kayak_ui::widgets::{
- BackgroundBundle, ClipBundle, ElementBundle, NinePatch, TextProps, TextWidgetBundle,
-};
+use kayak_ui::widgets::{BackgroundBundle, ClipBundle, ElementBundle, TextProps, TextWidgetBundle};
use kayak_ui::DEFAULT_FONT;
use web_instant::Spot;
@@ -174,20 +172,19 @@ pub fn render_text_box_widget(
text_box.background_active
.clone()
.unwrap_or_else(|| THEME_NINEPATCH_TEXTBOX_ACTIVE.to_string())
- },
+ }
false => {
text_box.background_active
.clone()
.unwrap_or_else(|| THEME_NINEPATCH_TEXTBOX_ACTIVE.to_string())
}
};
- let patch = theme_provider.get_patch(asset_name).unwrap();
+ let patch = theme_provider.get_patch(asset_name).unwrap();
RenderCommand::NinePatch {
handle: patch.handle.clone_weak(),
- border: patch.border.clone()
+ border: patch.border.clone(),
}
- })
- ,
+ }),
..Default::default()
})
// Apply any prop-given styles
diff --git a/src/components/button.rs b/src/components/button.rs
index 87de208..0f8616b 100644
--- a/src/components/button.rs
+++ b/src/components/button.rs
@@ -1,7 +1,7 @@
use bevy::prelude::*;
use kayak_font::{KayakFont, TextProperties};
use kayak_ui::prelude::*;
-use kayak_ui::widgets::{ElementBundle, NinePatch, NinePatchBundle, TextProps, TextWidgetBundle};
+use kayak_ui::widgets::{ElementBundle, NinePatchBundle, TextProps, TextWidgetBundle};
use micro_musicbox::prelude::MusicBox;
use num_traits::AsPrimitive;
@@ -14,7 +14,7 @@ use crate::theme::tokens::{
};
use crate::theme::{ThemeMapping, ThemeProvider};
use crate::types::IconContent;
-use crate::{edge_px, px, stretch, val_auto, value};
+use crate::{px, stretch, value};
#[derive(Component, Clone, PartialEq, Default)]
pub struct ButtonWidgetProps {
@@ -76,14 +76,14 @@ pub struct ButtonWidgetState {
}
pub fn render_button_widget(
- In((mut widget_context, entity)): In<(KayakWidgetContext, Entity)>,
+ In((widget_context, entity)): In<(KayakWidgetContext, Entity)>,
mut commands: Commands,
state_query: Query<&ButtonWidgetState>,
mut query: Query<(&ButtonWidgetProps, &KChildren, &mut ComputedStyles, &KStyle)>,
theme_provider: ThemeProvider,
fonts: Res<Assets<KayakFont>>,
) -> bool {
- if let Ok((props, children, mut computed, style)) = query.get_mut(entity) {
+ if let Ok((props, _children, mut computed, style)) = query.get_mut(entity) {
let state_entity =
widget_context.use_state(&mut commands, entity, ButtonWidgetState::default());
diff --git a/src/components/inset_icon.rs b/src/components/inset_icon.rs
index 5c38d4a..f2db8c1 100644
--- a/src/components/inset_icon.rs
+++ b/src/components/inset_icon.rs
@@ -27,7 +27,7 @@ impl Widget for InsetIconProps {}
parent_widget!(InsetIconProps => InsetIconWidget);
pub fn render_inset_icon_widget(
- In((mut widget_context, entity)): In<(KayakWidgetContext, Entity)>,
+ In((widget_context, entity)): In<(KayakWidgetContext, Entity)>,
mut commands: Commands,
mut query: Query<(&InsetIconProps, &mut ComputedStyles, &KStyle)>,
theme_provider: ThemeProvider,
diff --git a/src/components/panel.rs b/src/components/panel.rs
index 68b86b3..19fbadd 100644
--- a/src/components/panel.rs
+++ b/src/components/panel.rs
@@ -24,7 +24,7 @@ impl Widget for PanelProps {}
parent_widget!(PanelProps => PanelWidget);
pub fn render_panel_widget(
- In((mut widget_context, entity)): In<(KayakWidgetContext, Entity)>,
+ In((widget_context, entity)): In<(KayakWidgetContext, Entity)>,
mut commands: Commands,
mut query: Query<(&PanelProps, &KChildren, &mut ComputedStyles, &KStyle)>,
theme_provider: ThemeProvider,
--
GitLab