Rename directory: src/bat -> src/bat_utils

15 files changed, 17 insertions, 17 deletions

diff --git a/src/bat/.travis.yml b/src/bat_utils/.travis.yml
index ec594b2b..ec594b2b 100644
--- a/src/bat/.travis.yml
+++ b/src/bat_utils/.travis.yml
diff --git a/src/bat/LICENSE b/src/bat_utils/LICENSE
index fda25d0f..8af3b8b8 100644
--- a/src/bat/LICENSE
+++ b/src/bat_utils/LICENSE
@@ -1,4 +1,4 @@
-Files under this directory (i.e. src/bat/) originated as copies of
+Files under this directory (i.e. src/bat_utils/) originated as copies of
 files from the `bat` project (https://github.com/sharkdp/bat), with
 subsequent modifications, as recorded in git history. The `bat`
 license is reproduced below.
diff --git a/src/bat/assets.rs b/src/bat_utils/assets.rs
index e1a73c75..6715a821 100644
--- a/src/bat/assets.rs
+++ b/src/bat_utils/assets.rs
@@ -1,5 +1,5 @@
 // Based on code from https://github.com/sharkdp/bat a1b9334a44a2c652f52dddaa83dbacba57372468
-// See src/bat/LICENSE
+// See src/bat_utils/LICENSE
 
 use std::fs::File;
 use std::io::{self, BufReader, Write};
@@ -11,7 +11,7 @@ use syntect::dumps::{from_binary, from_reader};
 use syntect::highlighting::ThemeSet;
 use syntect::parsing::SyntaxSet;
 
-use crate::bat::dirs::PROJECT_DIRS;
+use crate::bat_utils::dirs::PROJECT_DIRS;
 use crate::errors::*;
 
 pub struct HighlightingAssets {
diff --git a/src/bat/dirs.rs b/src/bat_utils/dirs.rs
index 26c49b20..eb3835a4 100644
--- a/src/bat/dirs.rs
+++ b/src/bat_utils/dirs.rs
@@ -1,5 +1,5 @@
 // Based on code from https://github.com/sharkdp/bat e981e974076a926a38f124b7d8746de2ca5f0a28
-// See src/bat/LICENSE
+// See src/bat_utils/LICENSE
 
 use dirs as dirs_rs;
 use lazy_static::lazy_static;
diff --git a/src/bat/less.rs b/src/bat_utils/less.rs
index f7429333..f7429333 100644
--- a/src/bat/less.rs
+++ b/src/bat_utils/less.rs
diff --git a/src/bat/mod.rs b/src/bat_utils/mod.rs
index 7812e7c0..7812e7c0 100644
--- a/src/bat/mod.rs
+++ b/src/bat_utils/mod.rs
diff --git a/src/bat/output.rs b/src/bat_utils/output.rs
index 0ec90359..eef00cd5 100644
--- a/src/bat/output.rs
+++ b/src/bat_utils/output.rs
@@ -1,6 +1,6 @@
 // https://github.com/sharkdp/bat a1b9334a44a2c652f52dddaa83dbacba57372468
 // src/output.rs
-// See src/bat/LICENSE
+// See src/bat_utils/LICENSE
 use std::env;
 use std::ffi::OsString;
 use std::io::{self, Write};
diff --git a/src/bat/terminal.rs b/src/bat_utils/terminal.rs
index 50351c48..50351c48 100644
--- a/src/bat/terminal.rs
+++ b/src/bat_utils/terminal.rs
diff --git a/src/cli.rs b/src/cli.rs
index a4aae8a9..8daa8efc 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -9,8 +9,8 @@ use structopt::{clap, StructOpt};
 use syntect::highlighting::Theme as SyntaxTheme;
 use syntect::parsing::SyntaxSet;
 
-use crate::bat::assets::HighlightingAssets;
-use crate::bat::output::PagingMode;
+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::options;
diff --git a/src/color.rs b/src/color.rs
index 87d0f814..d8b8a9f7 100644
--- a/src/color.rs
+++ b/src/color.rs
@@ -6,7 +6,7 @@ use ansi_term::Color;
 use lazy_static::lazy_static;
 use syntect::highlighting::Color as SyntectColor;
 
-use crate::bat::terminal::to_ansi_color;
+use crate::bat_utils::terminal::to_ansi_color;
 use crate::syntect_color;
 
 pub fn parse_color(s: &str, true_color: bool) -> Option<Color> {
diff --git a/src/config.rs b/src/config.rs
index 2ca83053..9a26b677 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -8,7 +8,7 @@ use syntect::highlighting::Style as SyntectStyle;
 use syntect::highlighting::Theme as SyntaxTheme;
 use syntect::parsing::SyntaxSet;
 
-use crate::bat::output::PagingMode;
+use crate::bat_utils::output::PagingMode;
 use crate::cli;
 use crate::color;
 use crate::delta::State;
diff --git a/src/main.rs b/src/main.rs
index bd65956d..69154f30 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,7 +5,7 @@ extern crate error_chain;
 
 mod align;
 mod ansi;
-mod bat;
+mod bat_utils;
 mod cli;
 mod color;
 mod config;
@@ -33,8 +33,8 @@ use bytelines::ByteLinesReader;
 use itertools::Itertools;
 use structopt::StructOpt;
 
-use crate::bat::assets::{list_languages, HighlightingAssets};
-use crate::bat::output::{OutputType, PagingMode};
+use crate::bat_utils::assets::{list_languages, HighlightingAssets};
+use crate::bat_utils::output::{OutputType, PagingMode};
 use crate::delta::delta;
 use crate::options::theme::is_light_syntax_theme;
 
diff --git a/src/options/set.rs b/src/options/set.rs
index 6a0e7340..e721c5ae 100644
--- a/src/options/set.rs
+++ b/src/options/set.rs
@@ -6,8 +6,8 @@ use std::str::FromStr;
 use console::Term;
 use structopt::clap;
 
-use crate::bat::assets::HighlightingAssets;
-use crate::bat::output::PagingMode;
+use crate::bat_utils::assets::HighlightingAssets;
+use crate::bat_utils::output::PagingMode;
 use crate::cli;
 use crate::config;
 use crate::env;
@@ -627,7 +627,7 @@ fn set_git_config_entries(opt: &mut cli::Opt, git_config: &mut git_config::GitCo
 pub mod tests {
     use std::fs::remove_file;
 
-    use crate::bat::output::PagingMode;
+    use crate::bat_utils::output::PagingMode;
     use crate::cli;
     use crate::tests::integration_test_utils::integration_test_utils;
 
diff --git a/src/options/theme.rs b/src/options/theme.rs
index 7e980f15..ae831202 100644
--- a/src/options/theme.rs
+++ b/src/options/theme.rs
@@ -8,7 +8,7 @@
 /// default is selected.
 use syntect::highlighting::ThemeSet;
 
-use crate::bat::assets::HighlightingAssets;
+use crate::bat_utils::assets::HighlightingAssets;
 use crate::cli;
 use crate::env;
 
diff --git a/src/paint.rs b/src/paint.rs
index 121617a6..febe7a75 100644
--- a/src/paint.rs
+++ b/src/paint.rs
@@ -601,7 +601,7 @@ fn is_whitespace_error(sections: &[(Style, &str)]) -> bool {
 mod superimpose_style_sections {
     use syntect::highlighting::Style as SyntectStyle;
 
-    use crate::bat::terminal::to_ansi_color;
+    use crate::bat_utils::terminal::to_ansi_color;
     use crate::style::Style;
 
     pub fn superimpose_style_sections(