avoid destructuring enums

dankamongmen · Sep 4, 2023 · 676bef7 · 676bef7
1 parent eb2f944
commit 676bef7
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 77 deletions.
diff --git a/src/color/alpha.rs b/src/color/alpha.rs
@@ -40,15 +40,14 @@ mod core_impls {
 
     impl fmt::Display for Alpha {
         fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-            use Alpha::*;
             write!(
                 f,
                 "{}",
                 match self {
-                    Opaque => "Opaque",
-                    Transparent => "Transparent",
-                    Blend => "Blend",
-                    HighContrast => "HighContrast",
+                    Alpha::Opaque => "Opaque",
+                    Alpha::Transparent => "Transparent",
+                    Alpha::Blend => "Blend",
+                    Alpha::HighContrast => "HighContrast",
                 }
             )
         }
@@ -92,12 +91,11 @@ mod core_impls {
 impl Alpha {
     /// Displays the short name identifier of the alpha value.
     pub fn display_short(&self) -> &str {
-        use Alpha::*;
         match self {
-            Blend => "B",
-            HighContrast => "H",
-            Opaque => "O",
-            Transparent => "T",
+            Alpha::Blend => "B",
+            Alpha::HighContrast => "H",
+            Alpha::Opaque => "O",
+            Alpha::Transparent => "T",
         }
     }
 }
diff --git a/src/error.rs b/src/error.rs
@@ -38,11 +38,10 @@ mod core_impls {
 
     impl fmt::Display for NotcursesError {
         fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-            use NotcursesError::*;
             match self {
-                NcError(e) => e.fmt(f),
-                IoError(e) => e.fmt(f),
-                Message(string) => write!(f, "Message: {}", string),
+                NotcursesError::NcError(e) => e.fmt(f),
+                NotcursesError::IoError(e) => e.fmt(f),
+                NotcursesError::Message(string) => write!(f, "Message: {}", string),
             }
         }
     }

diff --git a/src/input/input_type.rs b/src/input/input_type.rs
@@ -51,15 +51,14 @@ mod core_impls {
 
     impl fmt::Display for InputType {
         fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-            use InputType::*;
             write!(
                 f,
                 "{}",
                 match self {
-                    Unknown => "Unknown",
-                    Press => "Press",
-                    Repeat => "Repeat",
-                    Release => "Release",
+                    InputType::Unknown => "Unknown",
+                    InputType::Press => "Press",
+                    InputType::Repeat => "Repeat",
+                    InputType::Release => "Release",
                 }
             )
         }

diff --git a/src/input/received.rs b/src/input/received.rs
@@ -67,22 +67,20 @@ mod core_impls {
 
     impl fmt::Display for Received {
         fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-            use Received::*;
             let string = match self {
-                Key(k) => format!["{k}"],
-                Char(c) => format!["{c:?}"],
-                NoInput => "NoInput".to_string(),
+                Received::Key(k) => format!["{k}"],
+                Received::Char(c) => format!["{c:?}"],
+                Received::NoInput => "NoInput".to_string(),
             };
             write!(f, "{}", string)
         }
     }
     impl fmt::Debug for Received {
         fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-            use Received::*;
             let string = match self {
-                Key(k) => format!["Key({k})"],
-                Char(c) => format!["Char({c:?})"],
-                NoInput => "NoInput".to_string(),
+                Received::Key(k) => format!["Key({k})"],
+                Received::Char(c) => format!["Char({c:?})"],
+                Received::NoInput => "NoInput".to_string(),
             };
             write!(f, "Received::{}", string)
         }

diff --git a/src/notcurses/capabilities.rs b/src/notcurses/capabilities.rs
@@ -106,17 +106,16 @@ impl Capabilities {
 
     /// Returns `true` if the provided [`Blitter`] is among the capabilities.
     pub fn can_blitter(&self, blitter: Blitter) -> bool {
-        use Blitter::*;
         match blitter {
-            Default => true,
-            Ascii => true,
-            Half => self.halfblock,
-            Quadrant => self.quadrant,
-            Sextant => self.sextant,
-            Braille => self.braille,
-            Pixel => self.pixel,
-            _4x1 => self.utf8,
-            _8x1 => self.utf8,
+            Blitter::Default => true,
+            Blitter::Ascii => true,
+            Blitter::Half => self.halfblock,
+            Blitter::Quadrant => self.quadrant,
+            Blitter::Sextant => self.sextant,
+            Blitter::Braille => self.braille,
+            Blitter::Pixel => self.pixel,
+            Blitter::_4x1 => self.utf8,
+            Blitter::_8x1 => self.utf8,
         }
     }
 

diff --git a/src/notcurses/log_level.rs b/src/notcurses/log_level.rs
@@ -50,20 +50,19 @@ mod core_impls {
 
     impl fmt::Display for LogLevel {
         fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-            use LogLevel::*;
             write!(
                 f,
                 "{}",
                 match self {
-                    Silent => "Silent",
-                    Panic => "Panic",
-                    Fatal => "Fatal",
-                    Error => "Error",
-                    Warning => "Warning",
-                    Info => "Info",
-                    Verbose => "Verbose",
-                    Debug => "Debug",
-                    Trace => "Trace",
+                    LogLevel::Silent => "Silent",
+                    LogLevel::Panic => "Panic",
+                    LogLevel::Fatal => "Fatal",
+                    LogLevel::Error => "Error",
+                    LogLevel::Warning => "Warning",
+                    LogLevel::Info => "Info",
+                    LogLevel::Verbose => "Verbose",
+                    LogLevel::Debug => "Debug",
+                    LogLevel::Trace => "Trace",
                 }
             )
         }

diff --git a/src/plane/align.rs b/src/plane/align.rs
@@ -42,15 +42,14 @@ mod core_impls {
 
     impl fmt::Display for Align {
         fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-            use Align::*;
             write!(
                 f,
                 "{}",
                 match self {
-                    Left => "Left",
-                    Center => "Center",
-                    Right => "Right",
-                    Unaligned => "Unaligned",
+                    Align::Left => "Left",
+                    Align::Center => "Center",
+                    Align::Right => "Right",
+                    Align::Unaligned => "Unaligned",
                 }
             )
         }

diff --git a/src/visual/blitter.rs b/src/visual/blitter.rs
@@ -93,20 +93,19 @@ mod core_impls {
 
     impl fmt::Display for Blitter {
         fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-            use Blitter::*;
             write!(
                 f,
                 "{}",
                 match self {
-                    Default => "Default",
-                    Ascii => "Ascii",
-                    Half => "Half",
-                    Quadrant => "Quadrant",
-                    Sextant => "Sextant",
-                    Braille => "Braille",
-                    Pixel => "Pixel",
-                    _4x1 => "4x1",
-                    _8x1 => "8x1",
+                    Blitter::Default => "Default",
+                    Blitter::Ascii => "Ascii",
+                    Blitter::Half => "Half",
+                    Blitter::Quadrant => "Quadrant",
+                    Blitter::Sextant => "Sextant",
+                    Blitter::Braille => "Braille",
+                    Blitter::Pixel => "Pixel",
+                    Blitter::_4x1 => "4x1",
+                    Blitter::_8x1 => "8x1",
                 }
             )
         }
@@ -195,15 +194,14 @@ impl Blitter {
     ///
     /// Default & Pixel returns `None`.
     pub const fn cell_size(&self) -> Option<(u8, u8)> {
-        use Blitter::*;
         match self {
-            Ascii => Some((1, 1)),
-            Half => Some((1, 2)),
-            Quadrant => Some((2, 2)),
-            Sextant => Some((2, 3)),
-            Braille => Some((2, 4)),
-            _4x1 => Some((1, 4)),
-            _8x1 => Some((1, 8)),
+            Blitter::Ascii => Some((1, 1)),
+            Blitter::Half => Some((1, 2)),
+            Blitter::Quadrant => Some((2, 2)),
+            Blitter::Sextant => Some((2, 3)),
+            Blitter::Braille => Some((2, 4)),
+            Blitter::_4x1 => Some((1, 4)),
+            Blitter::_8x1 => Some((1, 8)),
             _ => None, // Default, Pixel, …
         }
     }

diff --git a/src/visual/pixel.rs b/src/visual/pixel.rs
@@ -48,18 +48,17 @@ mod core_impls {
 
     impl fmt::Display for PixelImplementation {
         fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-            use PixelImplementation::*;
             write!(
                 f,
                 "{}",
                 match self {
                     PixelImplementation::None => "None",
-                    Sixel => "Sixel",
-                    LinuxFb => "LinuxFb",
-                    Iterm2 => "Iterm2",
-                    KittyStatic => "KittyStatic",
-                    KittyAnimated => "KittyAnimated",
-                    KittySelfRef => "KittySelfRef",
+                    PixelImplementation::Sixel => "Sixel",
+                    PixelImplementation::LinuxFb => "LinuxFb",
+                    PixelImplementation::Iterm2 => "Iterm2",
+                    PixelImplementation::KittyStatic => "KittyStatic",
+                    PixelImplementation::KittyAnimated => "KittyAnimated",
+                    PixelImplementation::KittySelfRef => "KittySelfRef",
                 }
             )
         }