Create git_config module

7 files changed, 12 insertions, 15 deletions

diff --git a/src/cli.rs b/src/cli.rs
index 743b72f3..41f6eb89 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -11,8 +11,7 @@ use syntect::parsing::SyntaxSet;
 
 use crate::bat_utils::assets::HighlightingAssets;
 use crate::bat_utils::output::PagingMode;
-use crate::git_config::GitConfig;
-use crate::git_config_entry::GitConfigEntry;
+use crate::git_config::{GitConfig, GitConfigEntry};
 use crate::options;
 
 #[derive(StructOpt, Clone, Default)]
diff --git a/src/config.rs b/src/config.rs
index d7828952..23b7b97d 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -14,7 +14,7 @@ use crate::color;
 use crate::delta::State;
 use crate::env;
 use crate::features::side_by_side;
-use crate::git_config_entry::GitConfigEntry;
+use crate::git_config::GitConfigEntry;
 use crate::style::{self, Style};
 
 pub struct Config {
diff --git a/src/features/hyperlinks.rs b/src/features/hyperlinks.rs
index 3bb5e70c..d59f5e9b 100644
--- a/src/features/hyperlinks.rs
+++ b/src/features/hyperlinks.rs
@@ -5,7 +5,7 @@ use regex::{Captures, Regex};
 
 use crate::config::Config;
 use crate::features::OptionValueFunction;
-use crate::git_config_entry::{GitConfigEntry, GitRemoteRepo};
+use crate::git_config::{GitConfigEntry, GitRemoteRepo};
 
 pub fn make_feature() -> Vec<(String, OptionValueFunction)> {
     builtin_feature!([
diff --git a/src/git_config.rs b/src/git_config/git_config.rs
index ab831b31..ab831b31 100644
--- a/src/git_config.rs
+++ b/src/git_config/git_config.rs
diff --git a/src/git_config_entry.rs b/src/git_config/git_config_entry.rs
index 2764e2bd..2764e2bd 100644
--- a/src/git_config_entry.rs
+++ b/src/git_config/git_config_entry.rs
diff --git a/src/main.rs b/src/main.rs
index cad56b93..5757fbab 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,7 +17,6 @@ mod env;
 mod features;
 mod format;
 mod git_config;
-mod git_config_entry;
 mod hunk_header;
 mod options;
 mod paint;
diff --git a/src/options/set.rs b/src/options/set.rs
index eb74a31d..354eeea6 100644
--- a/src/options/set.rs
+++ b/src/options/set.rs
@@ -13,8 +13,7 @@ use crate::config;
 use crate::env;
 use crate::errors::*;
 use crate::features;
-use crate::git_config;
-use crate::git_config_entry::{self, GitConfigEntry};
+use crate::git_config::{GitConfig, GitConfigEntry, GitRemoteRepo};
 use crate::options::option_value::{OptionValue, ProvenancedOptionValue};
 use crate::options::theme;
 
@@ -64,7 +63,7 @@ macro_rules! set_options {
 
 pub fn set_options(
     opt: &mut cli::Opt,
-    git_config: &mut Option<git_config::GitConfig>,
+    git_config: &mut Option<GitConfig>,
     arg_matches: &clap::ArgMatches,
     assets: HighlightingAssets,
 ) {
@@ -204,7 +203,7 @@ pub fn set_options(
 #[allow(non_snake_case)]
 fn set__light__dark__syntax_theme__options(
     opt: &mut cli::Opt,
-    git_config: &mut Option<git_config::GitConfig>,
+    git_config: &mut Option<GitConfig>,
     arg_matches: &clap::ArgMatches,
     option_names: &HashMap<&str, &str>,
 ) {
@@ -291,7 +290,7 @@ fn set__light__dark__syntax_theme__options(
 fn gather_features(
     opt: &cli::Opt,
     builtin_features: &HashMap<String, features::BuiltinFeature>,
-    git_config: &Option<git_config::GitConfig>,
+    git_config: &Option<GitConfig>,
 ) -> Vec<String> {
     let mut features = VecDeque::new();
 
@@ -372,7 +371,7 @@ fn gather_features_recursively(
     features: &mut VecDeque<String>,
     builtin_features: &HashMap<String, features::BuiltinFeature>,
     opt: &cli::Opt,
-    git_config: &git_config::GitConfig,
+    git_config: &GitConfig,
 ) {
     if builtin_features.contains_key(feature) {
         gather_builtin_features_recursively(feature, features, builtin_features, opt);
@@ -408,7 +407,7 @@ fn gather_builtin_features_from_flags_in_gitconfig(
     features: &mut VecDeque<String>,
     builtin_features: &HashMap<String, features::BuiltinFeature>,
     opt: &cli::Opt,
-    git_config: &git_config::GitConfig,
+    git_config: &GitConfig,
 ) {
     for child_feature in builtin_features.keys() {
         if let Some(value) =
@@ -510,7 +509,7 @@ fn parse_paging_mode(paging_mode_string: &str) -> PagingMode {
 
 fn set_widths(
     opt: &mut cli::Opt,
-    git_config: &mut Option<git_config::GitConfig>,
+    git_config: &mut Option<GitConfig>,
     arg_matches: &clap::ArgMatches,
     option_names: &HashMap<&str, &str>,
 ) {
@@ -571,7 +570,7 @@ fn is_truecolor_terminal() -> bool {
         .unwrap_or(false)
 }
 
-fn set_git_config_entries(opt: &mut cli::Opt, git_config: &mut git_config::GitConfig) {
+fn set_git_config_entries(opt: &mut cli::Opt, git_config: &mut GitConfig) {
     // Styles
     for key in &["color.diff.old", "color.diff.new"] {
         if let Some(style_string) = git_config.get::<String>(key) {
@@ -583,7 +582,7 @@ fn set_git_config_entries(opt: &mut cli::Opt, git_config: &mut git_config::GitCo
     // Strings
     for key in &["remote.origin.url"] {
         if let Some(string) = git_config.get::<String>(key) {
-            if let Ok(repo) = git_config_entry::GitRemoteRepo::from_str(&string) {
+            if let Ok(repo) = GitRemoteRepo::from_str(&string) {
                 opt.git_config_entries
                     .insert(key.to_string(), GitConfigEntry::GitRemote(repo));
             }