diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2022-07-09 18:03:59 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2022-07-09 18:03:59 +0200 |
| commit | 2f76a10a1d3617e414fb33c0c6cd5cb7782197ad (patch) | |
| tree | c5c1d4e9e29752abc15d1f3559369e42c1bbb772 /style/src | |
| parent | 33a24b58210c88571f789ee27495e3ee3a55e3a4 (diff) | |
| download | iced-2f76a10a1d3617e414fb33c0c6cd5cb7782197ad.tar.gz iced-2f76a10a1d3617e414fb33c0c6cd5cb7782197ad.tar.bz2 iced-2f76a10a1d3617e414fb33c0c6cd5cb7782197ad.zip | |
Fix further `clippy` lints
... and explicitly annotate crates as well.
Diffstat (limited to 'style/src')
| -rw-r--r-- | style/src/lib.rs | 10 | ||||
| -rw-r--r-- | style/src/text.rs | 8 | ||||
| -rw-r--r-- | style/src/theme.rs | 8 |
3 files changed, 15 insertions, 11 deletions
diff --git a/style/src/lib.rs b/style/src/lib.rs index ee426e98..0dde9582 100644 --- a/style/src/lib.rs +++ b/style/src/lib.rs @@ -7,6 +7,16 @@ #![doc( html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg" )] +#![deny( + unused_results, + clippy::extra_unused_lifetimes, + clippy::from_over_into, + clippy::needless_borrow, + clippy::new_without_default, + clippy::useless_conversion +)] +#![forbid(unsafe_code, rust_2018_idioms)] +#![allow(clippy::inherent_to_string, clippy::type_complexity)] pub use iced_core::{Background, Color}; pub mod application; diff --git a/style/src/text.rs b/style/src/text.rs index 69a4ed85..6e3aeef8 100644 --- a/style/src/text.rs +++ b/style/src/text.rs @@ -6,13 +6,7 @@ pub trait StyleSheet { fn appearance(&self, style: Self::Style) -> Appearance; } -#[derive(Debug, Clone, Copy)] +#[derive(Debug, Clone, Copy, Default)] pub struct Appearance { pub color: Option<Color>, } - -impl Default for Appearance { - fn default() -> Self { - Self { color: None } - } -} diff --git a/style/src/theme.rs b/style/src/theme.rs index d2de8a5d..5697b240 100644 --- a/style/src/theme.rs +++ b/style/src/theme.rs @@ -419,7 +419,7 @@ impl radio::StyleSheet for Theme { radio::Appearance { background: Color::TRANSPARENT.into(), - dot_color: palette.primary.strong.color.into(), + dot_color: palette.primary.strong.color, border_width: 1.0, border_color: palette.primary.strong.color, text_color: None, @@ -431,7 +431,7 @@ impl radio::StyleSheet for Theme { let palette = self.extended_palette(); radio::Appearance { - dot_color: palette.primary.strong.color.into(), + dot_color: palette.primary.strong.color, background: palette.primary.weak.color.into(), ..active } @@ -599,7 +599,7 @@ impl scrollable::StyleSheet for Theme { border_width: 0.0, border_color: Color::TRANSPARENT, scroller: scrollable::Scroller { - color: palette.background.strong.color.into(), + color: palette.background.strong.color, border_radius: 2.0, border_width: 0.0, border_color: Color::TRANSPARENT, @@ -616,7 +616,7 @@ impl scrollable::StyleSheet for Theme { border_width: 0.0, border_color: Color::TRANSPARENT, scroller: scrollable::Scroller { - color: palette.primary.strong.color.into(), + color: palette.primary.strong.color, border_radius: 2.0, border_width: 0.0, border_color: Color::TRANSPARENT, |