a2ee753 · bat · git.iko.soy

git.iko.soy/bat

Move config.rs into src/bin/bat/

commita2ee753b2502ac8d8e8a4ddaf38f96f2b2673c36 authorFahmi Akbar Wildana <f.a.wildana@gmail.com> dateSun 6 Oct 2019, 08:44 (7 years ago) parentd324390

4 files changed+7−6

compare with master

unifiedsplit

src/bin/bat/app.rs+4−2 src/config.rs → src/bin/bat/config.rs+1−2 src/bin/bat/main.rs+2−1 src/lib.rs−1

src/bin/bat/app.rs+4−2

@@ -4,7 +4,10 @@ use std::str::FromStr;

55use atty::{self, Stream};

7−use crate::clap_app;

7+use crate::{

8+ clap_app,

9+ config::{get_args_from_config_file, get_args_from_env_var},

10+};

811use clap::ArgMatches;

912use wild;

1013

@@ -15,7 +18,6 @@ use ansi_term;

1518

1619use bat::{

1720 assets::BAT_THEME_DEFAULT,

18− config::{get_args_from_config_file, get_args_from_env_var},

1921 errors::*,

2022 inputfile::InputFile,

2123 line_range::{LineRange, LineRanges},

src/config.rs → src/bin/bat/config.rsrenamed+1−2

@@ -5,8 +5,7 @@ use std::path::PathBuf;

66use shell_words;

8−use crate::dirs::PROJECT_DIRS;

9−use crate::util::transpose;

8+use bat::{dirs::PROJECT_DIRS, util::transpose};

109

1110pub fn config_file() -> PathBuf {

1211 env::var("BAT_CONFIG_PATH")

src/bin/bat/main.rs+2−1

@@ -6,6 +6,7 @@ extern crate clap;

77mod app;

88mod clap_app;

9+mod config;

910mod controller;

1011mod decorations;

1112mod output;

@@ -22,12 +23,12 @@ use ansi_term::Style;

2223

2324use crate::{

2425 app::{App, Config},

26+ config::config_file,

2527 controller::Controller,

2628};

2729

2830use bat::{

2931 assets::{cache_dir, clear_assets, config_dir, HighlightingAssets},

30− config::config_file,

3132 errors::*,

3233 inputfile::InputFile,

3334 style::{OutputComponent, OutputComponents},

src/lib.rs−1

@@ -19,7 +19,6 @@ extern crate syntect;

1919extern crate wild;

2020

2121pub mod assets;

22−pub mod config;

2322pub mod diff;

2423pub mod dirs;

2524pub mod inputfile;