Merge remote-tracking branch 'origin/master' into feat/multi-window-support

# Conflicts:
#	native/src/command/action.rs
#	native/src/window/action.rs
#	winit/src/window.rs

1 files changed, 6 insertions, 9 deletions

diff --git a/winit/src/icon.rs b/winit/src/icon.rs
index 84b88b39..73b4e037 100644
--- a/winit/src/icon.rs
+++ b/winit/src/icon.rs
@@ -132,10 +132,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 {
@@ -145,20 +144,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:?}")
             }
         }
     }