ca066bf · bat · git.iko.soy

git.iko.soy/bat

Run 'cargo fmt'

commitca066bf7cd9919816c47c8c0dc28f16c61766889 authorsharkdp <davidpeter@web.de> dateFri 28 Feb 2020, 10:27 (7 years ago) parent4ac3161

6 files changed+19−11

compare with master

unifiedsplit

src/bin/bat/main.rs+1−1 src/diff.rs+1−1 src/inputfile.rs+3−2 src/line_range.rs+6−3 src/printer.rs+4−2 tests/integration_tests.rs+4−2

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

@@ -9,11 +9,11 @@ mod clap_app;

99mod config;

1010

1111use std::collections::HashSet;

12+use std::ffi::OsStr;

1213use std::io;

1314use std::io::Write;

1415use std::path::Path;

1516use std::process;

16−use std::ffi::OsStr;

1717

1818use ansi_term::Colour::Green;

1919use ansi_term::Style;

src/diff.rs+1−1

@@ -1,7 +1,7 @@

11use std::collections::HashMap;

2+use std::ffi::OsStr;

23use std::fs;

34use std::path::Path;

4−use std::ffi::OsStr;

66use git2::{DiffOptions, IntoCString, Repository};

src/inputfile.rs+3−2

@@ -1,6 +1,6 @@

1+use std::ffi::OsStr;

12use std::fs::File;

23use std::io::{self, BufRead, BufReader};

3−use std::ffi::OsStr;

55use content_inspector::{self, ContentType};

@@ -64,7 +64,8 @@ impl<'a> InputFile<'a> {

6464 match self {

6565 InputFile::StdIn => Ok(InputFileReader::new(stdin.lock())),

6666 InputFile::Ordinary(filename) => {

67− let file = File::open(filename).map_err(|e| format!("'{}': {}", filename.to_string_lossy(), e))?;

67+ let file = File::open(filename)

68+ .map_err(|e| format!("'{}': {}", filename.to_string_lossy(), e))?;

6869

6970 if file.metadata()?.is_dir() {

7071 return Err(format!("'{}' is a directory.", filename.to_string_lossy()).into());

src/line_range.rs+6−3

@@ -35,13 +35,16 @@ impl LineRange {

3535 new_range.lower = line_numbers[0].parse()?;

3636 new_range.upper = new_range.lower;

3737 Ok(new_range)

38− },

38+ }

3939 2 => {

4040 new_range.lower = line_numbers[0].parse()?;

4141 new_range.upper = line_numbers[1].parse()?;

4242 Ok(new_range)

43− },

44− _ => Err("Line range contained more than one ':' character. Expected format: 'N' or 'N:M'".into()),

43+ }

44+ _ => Err(

45+ "Line range contained more than one ':' character. Expected format: 'N' or 'N:M'"

46+ .into(),

47+ ),

4548 }

4649 }

4750

src/printer.rs+4−2

@@ -1,6 +1,6 @@

1+use std::borrow::Cow;

12use std::io::Write;

23use std::vec::Vec;

3−use std::borrow::Cow;

55use ansi_term::Colour::{Fixed, Green, Red, Yellow};

66use ansi_term::Style;

@@ -228,7 +228,9 @@ impl<'a> Printer for InteractivePrinter<'a> {

228228 if !self.config.output_components.header() {

229229 if Some(ContentType::BINARY) == self.content_type && !self.config.show_nonprintable {

230230 let input = match file {

231− InputFile::Ordinary(filename) => format!("file '{}'", filename.to_string_lossy()),

231+ InputFile::Ordinary(filename) => {

232+ format!("file '{}'", filename.to_string_lossy())

233+ }

232234 _ => "STDIN".into(),

233235 };

234236

tests/integration_tests.rs+4−2

@@ -494,7 +494,8 @@ fn unicode_wrap() {

494494 .arg("--terminal-width=40")

495495 .assert()

496496 .success()

497− .stdout(" 1 ビタミンA ビタミンD ビタミンE ビ

497+ .stdout(

498+ " 1 ビタミンA ビタミンD ビタミンE ビ

498499 タミンK ビタミンB1 ビタミンB2 ナ

499500 イアシンパントテン酸ビタミンB6

500501 ビタミンB12 葉酸ビオチンビタ

@@ -522,7 +523,8 @@ fn unicode_wrap() {

522523 дерланды Австрия Польша Португалия

523524 Румыния Словения Словакия Финляндия

524525 Швеция Великобритания

525−");

526+",

527+ );

526528}

527529

528530#[test]