on master help sign in
cargo fmt
commit495fab24a57b75b0b773acb708164950221d3800 authorsharkdp <davidpeter@web.de> dateSat 11 Apr 2020, 19:40 (7 years ago) parentfccbe4f
4 files changed+20−6
Cargo.lock+1−1 src/bin/bat/config.rs+14−3 src/bin/bat/main.rs+4−1 src/printer.rs+1−1
Cargo.lock+1−1
@@ -490,7 +490,7 @@ version = "0.3.3"
490490source = "registry+https://github.com/rust-lang/crates.io-index"
491491dependencies = [
492492 "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)",
494494]
495495
496496[[package]]
src/bin/bat/config.rs+14−3
@@ -17,7 +17,10 @@ pub fn config_file() -> PathBuf {
1717pub fn generate_config_file() -> bat::errors::Result<()> {
1818 let config_file = config_file();
1919 if config_file.exists() {
20− println!("A config file already exists at: {}", config_file.to_string_lossy());
20+ println!(
21+ "A config file already exists at: {}",
22+ config_file.to_string_lossy()
23+ );
2124
2225 print!("Overwrite? (y/N): ");
2326 io::stdout().flush()?;
@@ -31,7 +34,12 @@ pub fn generate_config_file() -> bat::errors::Result<()> {
3134 let config_dir = config_file.parent();
3235 match config_dir {
3336 Some(path) => fs::create_dir_all(path)?,
34− None => return Ok(Err(format!("Unable to write config file to: {}", config_file.to_string_lossy()))?),
37+ None => {
38+ return Ok(Err(format!(
39+ "Unable to write config file to: {}",
40+ config_file.to_string_lossy()
41+ ))?)
42+ }
3543 }
3644 }
3745
@@ -54,7 +62,10 @@ pub fn generate_config_file() -> bat::errors::Result<()> {
5462"#;
5563
5664 fs::write(&config_file, default_config)?;
57− println!("Success! Config file written to {}", config_file.to_string_lossy());
65+ println!(
66+ "Success! Config file written to {}",
67+ config_file.to_string_lossy()
68+ );
5869
5970 return Ok(());
6071}
src/bin/bat/main.rs+4−1
@@ -17,7 +17,10 @@ use std::process;
1717use ansi_term::Colour::Green;
1818use ansi_term::Style;
1919
20−use crate::{app::App, config::{config_file, generate_config_file}};
20+use crate::{
21+ app::App,
22+ config::{config_file, generate_config_file},
23+};
2124use assets::{assets_from_cache_or_binary, cache_dir, clear_assets, config_dir};
2225use bat::Controller;
2326use directories::PROJECT_DIRS;
src/printer.rs+1−1
@@ -21,9 +21,9 @@ use unicode_width::UnicodeWidthChar;
2121
2222use crate::assets::HighlightingAssets;
2323use crate::config::Config;
24−use crate::decorations::{Decoration, GridBorderDecoration, LineNumberDecoration};
2524#[cfg(feature = "git")]
2625use crate::decorations::LineChangesDecoration;
26+use crate::decorations::{Decoration, GridBorderDecoration, LineNumberDecoration};
2727#[cfg(feature = "git")]
2828use crate::diff::{get_git_diff, LineChanges};
2929use crate::errors::*;