8e18786 · bat · git.iko.soy

git.iko.soy/bat

Run 'cargo fmt'

commit8e187865560aaf5349f85c0e42babb08958883c2 authorsharkdp <davidpeter@web.de> dateFri 24 Apr 2020, 16:09 (7 years ago) parent81488ad

5 files changed+11−7

compare with master

unifiedsplit

build.rs+2−1 src/bin/bat/app.rs+1−3 src/bin/bat/assets.rs+2−1 src/bin/bat/config.rs+2−1 src/preprocessor.rs+4−1

build.rs+2−1

@@ -19,7 +19,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {

1919 // Read environment variables.

2020 lazy_static! {

2121 static ref PROJECT_NAME: &'static str = option_env!("PROJECT_NAME").unwrap_or("bat");

22− static ref EXECUTABLE_NAME: &'static str = option_env!("PROJECT_EXECUTABLE").unwrap_or(*PROJECT_NAME);

22+ static ref EXECUTABLE_NAME: &'static str =

23+ option_env!("PROJECT_EXECUTABLE").unwrap_or(*PROJECT_NAME);

2324 }

2425

2526 /// Generates a file from a liquid template.

src/bin/bat/app.rs+1−3

@@ -250,9 +250,7 @@ impl App {

250250 .map(|values| values.collect());

251251

252252 let mut filenames_or_none: Box<dyn Iterator<Item = _>> = match filenames {

253− Some(ref filenames) => {

254− Box::new(filenames.iter().map(|name| Some(OsStr::new(*name))))

255− }

253+ Some(ref filenames) => Box::new(filenames.iter().map(|name| Some(OsStr::new(*name)))),

256254 None => Box::new(std::iter::repeat(None)),

257255 };

258256 let files: Option<Vec<&OsStr>> = self.matches.values_of_os("FILE").map(|vs| vs.collect());

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

@@ -53,5 +53,6 @@ pub fn assets_from_cache_or_binary() -> Result<HighlightingAssets> {

5353 }

5454 }

5555

56− Ok(HighlightingAssets::from_cache(&cache_dir).unwrap_or_else(|_| HighlightingAssets::from_binary()))

56+ Ok(HighlightingAssets::from_cache(&cache_dir)

57+ .unwrap_or_else(|_| HighlightingAssets::from_binary()))

5758}

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

@@ -38,7 +38,8 @@ pub fn generate_config_file() -> bat::error::Result<()> {

3838 return Err(format!(

3939 "Unable to write config file to: {}",

4040 config_file.to_string_lossy()

41− ).into());

41+ )

42+ .into());

4243 }

4344 }

4445 }

src/preprocessor.rs+4−1

@@ -36,7 +36,10 @@ pub fn expand_tabs(line: &str, width: usize, cursor: &mut usize) -> String {

3636fn try_parse_utf8_char(input: &[u8]) -> Option<(char, usize)> {

3737 let str_from_utf8 = |seq| std::str::from_utf8(seq).ok();

3838

39− let decoded = input.get(0..1).and_then(str_from_utf8).map(|c| (c, 1))

39+ let decoded = input

40+ .get(0..1)

41+ .and_then(str_from_utf8)

42+ .map(|c| (c, 1))

4043 .or_else(|| input.get(0..2).and_then(str_from_utf8).map(|c| (c, 2)))

4144 .or_else(|| input.get(0..3).and_then(str_from_utf8).map(|c| (c, 3)))

4245 .or_else(|| input.get(0..4).and_then(str_from_utf8).map(|c| (c, 4)));