Use DecorationStyle instead of style::DecorationStyle

dandavison · May 27, 2020 · 1b0487d · 1b0487d
1 parent a4d3d30
commit 1b0487d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/src/config.rs b/src/config.rs
@@ -372,22 +372,20 @@ pub fn parse_style(
 }
 
 fn apply_special_decoration_attribute(
-    decoration_style: Option<style::DecorationStyle>,
+    decoration_style: Option<DecorationStyle>,
     special_attribute: &str,
     true_color: bool,
 ) -> Option<DecorationStyle> {
     let ansi_term_style = match decoration_style {
         None => ansi_term::Style::new(),
-        Some(style::DecorationStyle::Box(ansi_term_style)) => ansi_term_style,
-        Some(style::DecorationStyle::Underline(ansi_term_style)) => ansi_term_style,
-        Some(style::DecorationStyle::Omit) => ansi_term::Style::new(),
+        Some(DecorationStyle::Box(ansi_term_style)) => ansi_term_style,
+        Some(DecorationStyle::Underline(ansi_term_style)) => ansi_term_style,
+        Some(DecorationStyle::Omit) => ansi_term::Style::new(),
     };
     match parse_decoration_style(special_attribute, true_color) {
-        Some(style::DecorationStyle::Box(_)) => Some(style::DecorationStyle::Box(ansi_term_style)),
-        Some(style::DecorationStyle::Underline(_)) => {
-            Some(style::DecorationStyle::Underline(ansi_term_style))
-        }
-        Some(style::DecorationStyle::Omit) => Some(style::DecorationStyle::Omit),
+        Some(DecorationStyle::Box(_)) => Some(DecorationStyle::Box(ansi_term_style)),
+        Some(DecorationStyle::Underline(_)) => Some(DecorationStyle::Underline(ansi_term_style)),
+        Some(DecorationStyle::Omit) => Some(DecorationStyle::Omit),
         None => None,
     }
 }

diff --git a/src/delta.rs b/src/delta.rs
@@ -10,7 +10,7 @@ use crate::config::Config;
 use crate::draw;
 use crate::paint::Painter;
 use crate::parse;
-use crate::style::{self, DecorationStyle};
+use crate::style::DecorationStyle;
 
 #[derive(Clone, Debug, PartialEq)]
 pub enum State {
@@ -266,15 +266,15 @@ fn handle_hunk_header_line(
 ) -> std::io::Result<()> {
     let decoration_ansi_term_style;
     let draw_fn = match config.hunk_header_style.decoration_style {
-        Some(style::DecorationStyle::Box(style)) => {
+        Some(DecorationStyle::Box(style)) => {
             decoration_ansi_term_style = style;
             draw::write_boxed
         }
-        Some(style::DecorationStyle::Underline(style)) => {
+        Some(DecorationStyle::Underline(style)) => {
             decoration_ansi_term_style = style;
             draw::write_underlined
         }
-        Some(style::DecorationStyle::Omit) => return Ok(()),
+        Some(DecorationStyle::Omit) => return Ok(()),
         None => unreachable("Unreachable code path reached in handle_hunk_header_line."),
     };
     let (raw_code_fragment, line_number) = parse::parse_hunk_metadata(&line);