additional cleanup of Display impls

Author: cmoylan

uefi/src/data_types/strs.rs

@@ -57,16 +57,12 @@ pub enum UnalignedCStr16Error {
 
 impl Display for UnalignedCStr16Error {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                Self::InvalidChar(_usize) => "invalid character",
-                Self::InteriorNul(_usize) => "encountered null character",
-                Self::NotNulTerminated => "not null-terminated",
-                Self::BufferTooSmall => "buffer too small",
-            }
-        )
+        match self {
+            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"),
+        }
     }
 }
 
@@ -89,15 +85,11 @@ pub enum FromStrWithBufError {
 
 impl Display for FromStrWithBufError {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                Self::InvalidChar(_usize) => "invalid character",
-                Self::InteriorNul(_usize) => "encountered null character",
-                Self::BufferTooSmall => "buffer too small",
-            }
-        )
+        match self {
+            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"),
+        }
     }
 }
 

uefi/src/proto/driver/component_name.rs

@@ -240,13 +240,9 @@ pub enum LanguageError {
 
 impl Display for LanguageError {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                Self::Ascii { index } => "invalid character at index: {index}",
-            }
-        )
+        match self {
+            Self::Ascii { index } => write!(f, "invalid character at index: {index}"),
+        }
     }
 }