From d2eb8f0e16e8e9ddf858974b06a7b221679d7977 Mon Sep 17 00:00:00 2001
From: graelo <graelo@grael.cc>
Date: Tue, 31 May 2022 08:47:53 +0200
Subject: [PATCH] refactor: publicly expose error::Error

---
 src/config/basic.rs     | 5 ++---
 src/config/extended.rs  | 2 +-
 src/lib.rs              | 3 ++-
 src/textbuf/alphabet.rs | 2 +-
 src/textbuf/regexes.rs  | 2 +-
 src/tmux.rs             | 2 +-
 src/ui/colors.rs        | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/config/basic.rs b/src/config/basic.rs
index 729b6f2..feb62e3 100644
--- a/src/config/basic.rs
+++ b/src/config/basic.rs
@@ -1,9 +1,8 @@
 use clap::{ArgEnum, Parser};
 
 use crate::{
-    error::Error,
     textbuf::{alphabet, regexes},
-    ui, Result,
+    ui, Error, Result,
 };
 
 /// Main configuration, parsed from command line.
@@ -70,7 +69,7 @@ pub struct Config {
 
 /// Type introduced due to parsing limitation,
 /// as we cannot directly parse tuples into ui::HintStyle.
-#[derive(Debug, Clone, ArgEnum, Parser)]
+#[derive(Debug, Clone, ArgEnum)]
 pub enum HintStyleArg {
     Bold,
     Italic,
diff --git a/src/config/extended.rs b/src/config/extended.rs
index 43245e3..2075baf 100644
--- a/src/config/extended.rs
+++ b/src/config/extended.rs
@@ -4,7 +4,7 @@ use std::fmt;
 use clap::{ArgEnum, Parser};
 
 use super::basic;
-use crate::{error::Error, textbuf::alphabet, tmux, ui, Result};
+use crate::{textbuf::alphabet, tmux, ui, Error, Result};
 
 /// Extended configuration for handling Tmux-specific configuration (options
 /// and outputs). This is only used by `tmux-copyrat` and parsed from command
diff --git a/src/lib.rs b/src/lib.rs
index e680588..d15496c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,7 +4,8 @@ pub mod textbuf;
 pub mod tmux;
 pub mod ui;
 
-pub type Result<T> = std::result::Result<T, error::Error>;
+pub use error::Error;
+pub type Result<T> = std::result::Result<T, Error>;
 
 /// Run copyrat on an input string `buffer`, configured by `Opt`.
 ///
diff --git a/src/textbuf/alphabet.rs b/src/textbuf/alphabet.rs
index ec94d6a..64a6ce7 100644
--- a/src/textbuf/alphabet.rs
+++ b/src/textbuf/alphabet.rs
@@ -1,4 +1,4 @@
-use crate::{error::Error, Result};
+use crate::{Error, Result};
 
 /// Catalog of available alphabets.
 ///
diff --git a/src/textbuf/regexes.rs b/src/textbuf/regexes.rs
index 43e0db2..5d9489e 100644
--- a/src/textbuf/regexes.rs
+++ b/src/textbuf/regexes.rs
@@ -2,7 +2,7 @@
 //!
 //! All patterns must have one capture group. The first group is used.
 
-use crate::{error::Error, Result};
+use crate::{Error, Result};
 
 pub(super) const EXCLUDE_PATTERNS: [(&str, &str); 1] =
     [("ansi_colors", r"[[:cntrl:]]\[([0-9]{1,2};)?([0-9]{1,2})?m")];
diff --git a/src/tmux.rs b/src/tmux.rs
index 8ca5fb7..b528028 100644
--- a/src/tmux.rs
+++ b/src/tmux.rs
@@ -10,7 +10,7 @@ use std::str::FromStr;
 use regex::Regex;
 
 use crate::config::extended::CaptureRegion;
-use crate::{error::Error, Result};
+use crate::{Error, Result};
 
 /// Represents a simplified Tmux Pane, only holding the properties needed in
 /// this crate.
diff --git a/src/ui/colors.rs b/src/ui/colors.rs
index f598839..331d0b6 100644
--- a/src/ui/colors.rs
+++ b/src/ui/colors.rs
@@ -1,7 +1,7 @@
 use clap::Parser;
 use termion::color;
 
-use crate::{error::Error, Result};
+use crate::{Error, Result};
 
 pub fn parse_color(src: &str) -> Result<Box<dyn color::Color>> {
     match src {