diff --git a/src/bin/bat/app.rs b/src/bin/bat/app.rs index d067e681..af403acc 100644 --- a/src/bin/bat/app.rs +++ b/src/bin/bat/app.rs @@ -4,7 +4,10 @@ use std::str::FromStr; use atty::{self, Stream}; -use crate::clap_app; +use crate::{ + clap_app, + config::{get_args_from_config_file, get_args_from_env_var}, +}; use clap::ArgMatches; use wild; @@ -15,7 +18,6 @@ use ansi_term; use bat::{ assets::BAT_THEME_DEFAULT, - config::{get_args_from_config_file, get_args_from_env_var}, errors::*, inputfile::InputFile, line_range::{LineRange, LineRanges}, diff --git a/src/config.rs b/src/bin/bat/config.rs similarity index 97% rename from src/config.rs rename to src/bin/bat/config.rs index 0f46bff4..cf0714d7 100644 --- a/src/config.rs +++ b/src/bin/bat/config.rs @@ -5,8 +5,7 @@ use std::path::PathBuf; use shell_words; -use crate::dirs::PROJECT_DIRS; -use crate::util::transpose; +use bat::{dirs::PROJECT_DIRS, util::transpose}; pub fn config_file() -> PathBuf { env::var("BAT_CONFIG_PATH") diff --git a/src/bin/bat/main.rs b/src/bin/bat/main.rs index b5a6e25c..51855ca8 100644 --- a/src/bin/bat/main.rs +++ b/src/bin/bat/main.rs @@ -6,6 +6,7 @@ extern crate clap; mod app; mod clap_app; +mod config; mod controller; mod decorations; mod output; @@ -22,12 +23,12 @@ use ansi_term::Style; use crate::{ app::{App, Config}, + config::config_file, controller::Controller, }; use bat::{ assets::{cache_dir, clear_assets, config_dir, HighlightingAssets}, - config::config_file, errors::*, inputfile::InputFile, style::{OutputComponent, OutputComponents}, diff --git a/src/lib.rs b/src/lib.rs index 0a1cb369..db8ff804 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -19,7 +19,6 @@ extern crate syntect; extern crate wild; pub mod assets; -pub mod config; pub mod diff; pub mod dirs; pub mod inputfile;