clippy changes

iced-rs · Feb 20, 2024 · 2671392 · 2671392
1 parent d3e6a90
commit 2671392
Show file tree

Hide file tree

Showing 30 changed files with 2 additions and 34 deletions.
diff --git a/src/native/badge.rs b/src/native/badge.rs
@@ -3,7 +3,6 @@
 //! *This API requires the following crate features to be activated: badge*
 
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         renderer,

diff --git a/src/native/card.rs b/src/native/card.rs
@@ -5,7 +5,6 @@
 use crate::graphics::icons::{icon_to_string, BootstrapIcon, BOOTSTRAP_FONT};
 
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         renderer,

diff --git a/src/native/color_picker.rs b/src/native/color_picker.rs
@@ -7,7 +7,6 @@ use super::overlay::color_picker::{
 };
 
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         overlay, renderer,

diff --git a/src/native/context_menu.rs b/src/native/context_menu.rs
@@ -1,7 +1,6 @@
 //! A context menu for showing actions on right click.
 //!
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         overlay, renderer,

diff --git a/src/native/cupertino/cupertino_button.rs b/src/native/cupertino/cupertino_button.rs
@@ -2,7 +2,6 @@ use crate::graphics::SF_UI_ROUNDED;
 use crate::native::cupertino::cupertino_colors::{secondary_system_fill, system_blue};
 
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         renderer::{self, Quad},

diff --git a/src/native/cupertino/cupertino_spinner.rs b/src/native/cupertino/cupertino_spinner.rs
@@ -1,5 +1,4 @@
 use iced::{
-    self,
     advanced::{
         graphics::geometry::Renderer as _,
         layout::{Limits, Node},

diff --git a/src/native/cupertino/cupertino_switch.rs b/src/native/cupertino/cupertino_switch.rs
@@ -1,7 +1,6 @@
 use crate::native::cupertino::cupertino_colors::{secondary_system_fill, system_green};
 
 use iced::{
-    self,
     advanced::{
         graphics::geometry::Renderer as _,
         layout::{self, Limits, Node},

diff --git a/src/native/date_picker.rs b/src/native/date_picker.rs
@@ -6,7 +6,6 @@ use super::overlay::date_picker::{self, DatePickerOverlay, DatePickerOverlayButt
 
 use chrono::Local;
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         renderer,

diff --git a/src/native/drop_down.rs b/src/native/drop_down.rs
@@ -3,7 +3,6 @@
 //! *This API requires the following crate features to be activated: `drop_down`*
 
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         overlay, renderer,

diff --git a/src/native/floating_element.rs b/src/native/floating_element.rs
@@ -5,7 +5,6 @@
 use super::overlay::floating_element::FloatingElementOverlay;
 
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         overlay, renderer,

diff --git a/src/native/grid/layout.rs b/src/native/grid/layout.rs
@@ -126,7 +126,7 @@ fn minimum_row_column_sizes<Message, Theme, Renderer>(
             #[allow(clippy::option_if_let_else)]
             match column_widths.get_mut(col_idx) {
                 Some(col_width) => {
-                    *col_width = max_allowed_size.width.min(col_width.max(min_width))
+                    *col_width = max_allowed_size.width.min(col_width.max(min_width));
                 }
                 None => column_widths.insert(col_idx, max_allowed_size.width.min(min_width)),
             }

diff --git a/src/native/modal.rs b/src/native/modal.rs
@@ -5,7 +5,6 @@
 use super::overlay::modal::ModalOverlay;
 
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         overlay, renderer,

diff --git a/src/native/number_input.rs b/src/native/number_input.rs
@@ -2,7 +2,6 @@
 //!
 //! A [`NumberInput`] has some local [`State`].
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         renderer,

diff --git a/src/native/overlay/color_picker.rs b/src/native/overlay/color_picker.rs
@@ -16,7 +16,6 @@ use crate::{
 };
 
 use iced::{
-    self,
     advanced::{
         graphics::geometry::Renderer as _,
         layout::{Limits, Node},

diff --git a/src/native/overlay/context_menu.rs b/src/native/overlay/context_menu.rs
@@ -5,7 +5,6 @@ use crate::context_menu;
 use crate::style::context_menu::StyleSheet;
 
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         overlay, renderer,

diff --git a/src/native/overlay/date_picker.rs b/src/native/overlay/date_picker.rs
@@ -17,7 +17,6 @@ use crate::{
 
 use chrono::{Datelike, Local, NaiveDate};
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         overlay, renderer,

diff --git a/src/native/overlay/floating_element.rs b/src/native/overlay/floating_element.rs
@@ -5,7 +5,6 @@
 use crate::native::floating_element::{Anchor, Offset};
 
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         overlay, renderer,

diff --git a/src/native/overlay/modal.rs b/src/native/overlay/modal.rs
@@ -3,7 +3,6 @@
 //! *This API requires the following crate features to be activated: modal*
 use crate::style::modal::StyleSheet;
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         renderer,

diff --git a/src/native/overlay/time_picker.rs b/src/native/overlay/time_picker.rs
@@ -19,7 +19,6 @@ use crate::{
 
 use chrono::{Duration, Local, NaiveTime, Timelike};
 use iced::{
-    self,
     advanced::{
         graphics::geometry::Renderer as _,
         layout::{Limits, Node},

diff --git a/src/native/quad.rs b/src/native/quad.rs
@@ -4,7 +4,6 @@
 
 use crate::native::InnerBounds;
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         renderer,

diff --git a/src/native/segmented_button.rs b/src/native/segmented_button.rs
@@ -1,6 +1,5 @@
 //! Create choices using `segnmented_button` buttons.
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         renderer,

diff --git a/src/native/selection_list.rs b/src/native/selection_list.rs
@@ -3,7 +3,6 @@ pub mod list;
 use crate::style::selection_list::StyleSheet;
 
 use iced::{
-    self,
     advanced::{
         graphics,
         layout::{Limits, Node},

diff --git a/src/native/selection_list/list.rs b/src/native/selection_list/list.rs
@@ -3,7 +3,6 @@
 use crate::selection_list::StyleSheet;
 
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         renderer,
@@ -222,10 +221,7 @@ where
         let list_state = state.state.downcast_ref::<ListState>();
 
         for i in start..end.min(self.options.len()) {
-            let is_selected = list_state
-                .last_selected_index
-                .map(|u| u.0 == i)
-                .unwrap_or_default();
+            let is_selected = list_state.last_selected_index.is_some_and(|u| u.0 == i);
             let is_hovered = list_state.hovered_option == Some(i);
 
             let bounds = Rectangle {

diff --git a/src/native/slide_bar.rs b/src/native/slide_bar.rs
@@ -3,7 +3,6 @@
 //! *This API requires the following crate features to be activated: `quad`*
 
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         renderer,

diff --git a/src/native/spinner.rs b/src/native/spinner.rs
@@ -3,7 +3,6 @@
 use crate::style::spinner::StyleSheet;
 
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         renderer,

diff --git a/src/native/split.rs b/src/native/split.rs
@@ -3,7 +3,6 @@
 //! *This API requires the following crate features to be activated: split*
 
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         overlay, renderer,

diff --git a/src/native/tab_bar.rs b/src/native/tab_bar.rs
@@ -9,7 +9,6 @@ pub mod tab_label;
 use crate::graphics::icons::{icon_to_string, BootstrapIcon, BOOTSTRAP_FONT};
 
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         renderer,

diff --git a/src/native/tabs.rs b/src/native/tabs.rs
@@ -11,7 +11,6 @@ pub use crate::tab_bar::Position;
 use crate::{native::tab_bar::TabBar, style::tab_bar::StyleSheet, TabLabel};
 
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         overlay, renderer,

diff --git a/src/native/time_picker.rs b/src/native/time_picker.rs
@@ -6,7 +6,6 @@ use super::overlay::time_picker::{self, TimePickerOverlay, TimePickerOverlayButt
 
 use chrono::Local;
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         overlay, renderer,

diff --git a/src/native/wrap.rs b/src/native/wrap.rs
@@ -2,7 +2,6 @@
 //!
 //! *This API requires the following crate features to be activated: `wrap`*
 use iced::{
-    self,
     advanced::{
         layout::{Limits, Node},
         overlay, renderer,