diff options
| author |  Héctor Ramón Jiménez <hector@hecrj.dev> | 2023-10-27 03:58:45 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector@hecrj.dev> | 2023-10-27 03:58:45 +0200 |
| commit | 65823875791ecebf24d049cc0782e7475a37899b (patch) | |
| tree | 1088c656ef7ad9782374952045022d2c104931b2 /style | |
| parent | 8cc19de254c37d3123d5ea1b6513f1f34d35c7c8 (diff) | |
| parent | f1b1344d59fa7354615f560bd25ed01ad0c9f865 (diff) | |
| download | iced-65823875791ecebf24d049cc0782e7475a37899b.tar.gz iced-65823875791ecebf24d049cc0782e7475a37899b.tar.bz2 iced-65823875791ecebf24d049cc0782e7475a37899b.zip | |
Merge branch 'master' into text-editor
Diffstat (limited to 'style')
| -rw-r--r-- | style/src/lib.rs | 6 | ||||
| -rw-r--r-- | style/src/rule.rs | 2 | ||||
| -rw-r--r-- | style/src/theme.rs | 6 |
3 files changed, 4 insertions, 10 deletions
diff --git a/style/src/lib.rs b/style/src/lib.rs index c9879f24..35460f4b 100644 --- a/style/src/lib.rs +++ b/style/src/lib.rs @@ -10,16 +10,10 @@ #![forbid(unsafe_code, rust_2018_idioms)] #![deny( unused_results, - clippy::extra_unused_lifetimes, - clippy::from_over_into, - clippy::needless_borrow, - clippy::new_without_default, - clippy::useless_conversion, // missing_docs, unused_results, rustdoc::broken_intra_doc_links )] -#![allow(clippy::inherent_to_string, clippy::type_complexity)] pub use iced_core as core; pub mod application; diff --git a/style/src/rule.rs b/style/src/rule.rs index afae085c..efbe7444 100644 --- a/style/src/rule.rs +++ b/style/src/rule.rs @@ -47,7 +47,7 @@ impl FillMode { /// /// # Returns /// - /// * (starting_offset, length) + /// * (`starting_offset`, `length`) pub fn fill(&self, space: f32) -> (f32, f32) { match *self { FillMode::Full => (0.0, space), diff --git a/style/src/theme.rs b/style/src/theme.rs index a1501c01..47010728 100644 --- a/style/src/theme.rs +++ b/style/src/theme.rs @@ -394,7 +394,7 @@ impl container::StyleSheet for Theme { fn appearance(&self, style: &Self::Style) -> container::Appearance { match style { - Container::Transparent => Default::default(), + Container::Transparent => container::Appearance::default(), Container::Box => { let palette = self.extended_palette(); @@ -905,7 +905,7 @@ impl svg::StyleSheet for Theme { fn appearance(&self, style: &Self::Style) -> svg::Appearance { match style { - Svg::Default => Default::default(), + Svg::Default => svg::Appearance::default(), Svg::Custom(custom) => custom.appearance(self), } } @@ -1054,7 +1054,7 @@ impl text::StyleSheet for Theme { fn appearance(&self, style: Self::Style) -> text::Appearance { match style { - Text::Default => Default::default(), + Text::Default => text::Appearance::default(), Text::Color(c) => text::Appearance { color: Some(c) }, } } |