summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/widget.rs6
-rw-r--r--src/window/icon.rs15
2 files changed, 10 insertions, 11 deletions
diff --git a/src/widget.rs b/src/widget.rs
index f0058f57..7da5b82b 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -31,7 +31,7 @@ pub mod button {
pub mod checkbox {
//! Show toggle controls using checkboxes.
- pub use iced_native::widget::checkbox::{Appearance, StyleSheet};
+ pub use iced_native::widget::checkbox::{Appearance, Icon, StyleSheet};
/// A box that can be checked.
pub type Checkbox<'a, Message, Renderer = crate::Renderer> =
@@ -80,7 +80,9 @@ pub mod pane_grid {
pub mod pick_list {
//! Display a dropdown list of selectable values.
- pub use iced_native::widget::pick_list::{Appearance, Handle, StyleSheet};
+ pub use iced_native::widget::pick_list::{
+ Appearance, Handle, Icon, StyleSheet,
+ };
/// A widget allowing the selection of a single value from a list of options.
pub type PickList<'a, T, Message, Renderer = crate::Renderer> =
diff --git a/src/window/icon.rs b/src/window/icon.rs
index bacad41a..d57eb79c 100644
--- a/src/window/icon.rs
+++ b/src/window/icon.rs
@@ -133,10 +133,9 @@ impl fmt::Display for Error {
Error::InvalidData { byte_count } => {
write!(
f,
- "The provided RGBA data (with length {:?}) isn't divisble by \
+ "The provided RGBA data (with length {byte_count:?}) isn't divisble by \
4. Therefore, it cannot be safely interpreted as 32bpp RGBA \
- pixels.",
- byte_count,
+ pixels."
)
}
Error::DimensionsMismatch {
@@ -146,20 +145,18 @@ impl fmt::Display for Error {
} => {
write!(
f,
- "The number of RGBA pixels ({:?}) does not match the provided \
- dimensions ({:?}x{:?}).",
- pixel_count, width, height,
+ "The number of RGBA pixels ({pixel_count:?}) does not match the provided \
+ dimensions ({width:?}x{height:?})."
)
}
Error::OsError(e) => write!(
f,
"The underlying OS failed to create the window \
- icon: {:?}",
- e
+ icon: {e:?}"
),
#[cfg(feature = "image_rs")]
Error::ImageError(e) => {
- write!(f, "Unable to create icon from a file: {:?}", e)
+ write!(f, "Unable to create icon from a file: {e:?}")
}
}
}