From 2d8f7d30afd91c926cc66e8e3fc378732b0460bf Mon Sep 17 00:00:00 2001
From: Philipp Schuster <phip1611@gmail.com>
Date: Mon, 19 May 2025 21:49:44 +0200
Subject: [PATCH] clippy: fix upcoming nightly lints

---
 uefi/src/data_types/strs.rs             | 14 +++++++-------
 uefi/src/proto/driver/component_name.rs |  2 +-
 uefi/src/proto/media/file/info.rs       |  3 +--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/uefi/src/data_types/strs.rs b/uefi/src/data_types/strs.rs
index 16fcf029a..4bee5fe3e 100644
--- a/uefi/src/data_types/strs.rs
+++ b/uefi/src/data_types/strs.rs
@@ -31,7 +31,7 @@ pub enum FromSliceUntilNulError {
 impl Display for FromSliceUntilNulError {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
-            Self::InvalidChar(usize) => write!(f, "invalid character at index {}", usize),
+            Self::InvalidChar(usize) => write!(f, "invalid character at index {usize}"),
             Self::NoNul => write!(f, "no nul character"),
         }
     }
@@ -56,8 +56,8 @@ pub enum FromSliceWithNulError {
 impl Display for FromSliceWithNulError {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
-            Self::InvalidChar(usize) => write!(f, "invalid character at index {}", usize),
-            Self::InteriorNul(usize) => write!(f, "interior null character at index {}", usize),
+            Self::InvalidChar(usize) => write!(f, "invalid character at index {usize}"),
+            Self::InteriorNul(usize) => write!(f, "interior null character at index {usize}"),
             Self::NotNulTerminated => write!(f, "not null-terminated"),
         }
     }
@@ -85,8 +85,8 @@ pub enum UnalignedCStr16Error {
 impl Display for UnalignedCStr16Error {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
-            Self::InvalidChar(usize) => write!(f, "invalid character at index {}", usize),
-            Self::InteriorNul(usize) => write!(f, "interior null character at index {}", usize),
+            Self::InvalidChar(usize) => write!(f, "invalid character at index {usize}"),
+            Self::InteriorNul(usize) => write!(f, "interior null character at index {usize}"),
             Self::NotNulTerminated => write!(f, "not null-terminated"),
             Self::BufferTooSmall => write!(f, "buffer too small"),
         }
@@ -112,8 +112,8 @@ pub enum FromStrWithBufError {
 impl Display for FromStrWithBufError {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
-            Self::InvalidChar(usize) => write!(f, "invalid character at index {}", usize),
-            Self::InteriorNul(usize) => write!(f, "interior null character at index {}", usize),
+            Self::InvalidChar(usize) => write!(f, "invalid character at index {usize}"),
+            Self::InteriorNul(usize) => write!(f, "interior null character at index {usize}"),
             Self::BufferTooSmall => write!(f, "buffer too small"),
         }
     }
diff --git a/uefi/src/proto/driver/component_name.rs b/uefi/src/proto/driver/component_name.rs
index 3e328e586..2ae35b199 100644
--- a/uefi/src/proto/driver/component_name.rs
+++ b/uefi/src/proto/driver/component_name.rs
@@ -246,7 +246,7 @@ pub enum LanguageError {
 impl Display for LanguageError {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
-            Self::Ascii { index } => write!(f, "invalid character at index: {}", index),
+            Self::Ascii { index } => write!(f, "invalid character at index: {index}"),
         }
     }
 }
diff --git a/uefi/src/proto/media/file/info.rs b/uefi/src/proto/media/file/info.rs
index 51811d786..1fa9a9768 100644
--- a/uefi/src/proto/media/file/info.rs
+++ b/uefi/src/proto/media/file/info.rs
@@ -132,8 +132,7 @@ impl Display for FileInfoCreationError {
         match self {
             Self::InsufficientStorage(bytes) => write!(
                 f,
-                "provided buffer was too small. need at least {} bytes",
-                bytes
+                "provided buffer was too small. need at least {bytes} bytes"
             ),
         }
     }