495fab2 · bat · git.iko.soy

Cargo.lock+1−1

compare with master

unifiedsplit

@@ -490,7 +490,7 @@ version = "0.3.3"

490source = "registry+https://github.com/rust-lang/crates.io-index"

491dependencies = [

492 "bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",

493− "regex 1.3.5 (registry+https://github.com/rust-lang/crates.io-index)",

493+ "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)",

494]

495

496[[package]]

src/bin/bat/config.rs+14−3

@@ -17,7 +17,10 @@ pub fn config_file() -> PathBuf {

17pub fn generate_config_file() -> bat::errors::Result<()> {

18 let config_file = config_file();

19 if config_file.exists() {

20+ println!(

20− println!("A config file already exists at: {}", config_file.to_string_lossy());

21+ "A config file already exists at: {}",

22+ config_file.to_string_lossy()

23+ );

21

24

22 print!("Overwrite? (y/N): ");

25 print!("Overwrite? (y/N): ");

23 io::stdout().flush()?;

26 io::stdout().flush()?;

@@ -31,7 +34,12 @@ pub fn generate_config_file() -> bat::errors::Result<()> {

31 let config_dir = config_file.parent();

34 let config_dir = config_file.parent();

32 match config_dir {

35 match config_dir {

33 Some(path) => fs::create_dir_all(path)?,

36 Some(path) => fs::create_dir_all(path)?,

37+ None => {

38+ return Ok(Err(format!(

39+ "Unable to write config file to: {}",

34− None => return Ok(Err(format!("Unable to write config file to: {}", config_file.to_string_lossy()))?),

40+ config_file.to_string_lossy()

41+ ))?)

42+ }

35 }

43 }

36 }

44 }

37

45

@@ -54,7 +62,10 @@ pub fn generate_config_file() -> bat::errors::Result<()> {

54"#;

62"#;

55

63

56 fs::write(&config_file, default_config)?;

64 fs::write(&config_file, default_config)?;

65+ println!(

57− println!("Success! Config file written to {}", config_file.to_string_lossy());

66+ "Success! Config file written to {}",

67+ config_file.to_string_lossy()

68+ );

58

69

59 return Ok(());

70 return Ok(());

60}

71}

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

@@ -17,7 +17,10 @@ use std::process;

17use ansi_term::Colour::Green;

18use ansi_term::Style;

19

20+use crate::{

21+ app::App,

20−use crate::{app::App, config::{config_file, generate_config_file}};

22+ config::{config_file, generate_config_file},

23+};

21use assets::{assets_from_cache_or_binary, cache_dir, clear_assets, config_dir};

24use assets::{assets_from_cache_or_binary, cache_dir, clear_assets, config_dir};

22use bat::Controller;

25use bat::Controller;

23use directories::PROJECT_DIRS;

26use directories::PROJECT_DIRS;

src/printer.rs+1−1

@@ -21,9 +21,9 @@ use unicode_width::UnicodeWidthChar;

21

22use crate::assets::HighlightingAssets;

23use crate::config::Config;

24−use crate::decorations::{Decoration, GridBorderDecoration, LineNumberDecoration};

25#[cfg(feature = "git")]

24#[cfg(feature = "git")]

26use crate::decorations::LineChangesDecoration;

25use crate::decorations::LineChangesDecoration;

26+use crate::decorations::{Decoration, GridBorderDecoration, LineNumberDecoration};

27#[cfg(feature = "git")]

28use crate::diff::{get_git_diff, LineChanges};

29use crate::errors::*;