summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsharkdp <davidpeter@web.de>2020-04-24 16:09:56 +0200
committerDavid Peter <sharkdp@users.noreply.github.com>2020-04-24 16:11:05 +0200
commit8e187865560aaf5349f85c0e42babb08958883c2 (patch)
tree8a73af815dcbb006f5a3ea8e8df303d270c90dba
parent81488adf8b4a6b528f76c1b18ebd1da134db2cc3 (diff)
Run 'cargo fmt'
-rw-r--r--build.rs3
-rw-r--r--src/bin/bat/app.rs4
-rw-r--r--src/bin/bat/assets.rs3
-rw-r--r--src/bin/bat/config.rs3
-rw-r--r--src/preprocessor.rs5
5 files changed, 11 insertions, 7 deletions
diff --git a/build.rs b/build.rs
index 4bf6173c..693826a1 100644
--- a/build.rs
+++ b/build.rs
@@ -19,7 +19,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// Read environment variables.
lazy_static! {
static ref PROJECT_NAME: &'static str = option_env!("PROJECT_NAME").unwrap_or("bat");
- static ref EXECUTABLE_NAME: &'static str = option_env!("PROJECT_EXECUTABLE").unwrap_or(*PROJECT_NAME);
+ static ref EXECUTABLE_NAME: &'static str =
+ option_env!("PROJECT_EXECUTABLE").unwrap_or(*PROJECT_NAME);
}
/// Generates a file from a liquid template.
diff --git a/src/bin/bat/app.rs b/src/bin/bat/app.rs
index 8eab9e45..d5751f73 100644
--- a/src/bin/bat/app.rs
+++ b/src/bin/bat/app.rs
@@ -250,9 +250,7 @@ impl App {
.map(|values| values.collect());
let mut filenames_or_none: Box<dyn Iterator<Item = _>> = match filenames {
- Some(ref filenames) => {
- Box::new(filenames.iter().map(|name| Some(OsStr::new(*name))))
- }
+ Some(ref filenames) => Box::new(filenames.iter().map(|name| Some(OsStr::new(*name)))),
None => Box::new(std::iter::repeat(None)),
};
let files: Option<Vec<&OsStr>> = self.matches.values_of_os("FILE").map(|vs| vs.collect());
diff --git a/src/bin/bat/assets.rs b/src/bin/bat/assets.rs
index ead0b7cb..ef6484ab 100644
--- a/src/bin/bat/assets.rs
+++ b/src/bin/bat/assets.rs
@@ -53,5 +53,6 @@ pub fn assets_from_cache_or_binary() -> Result<HighlightingAssets> {
}
}
- Ok(HighlightingAssets::from_cache(&cache_dir).unwrap_or_else(|_| HighlightingAssets::from_binary()))
+ Ok(HighlightingAssets::from_cache(&cache_dir)
+ .unwrap_or_else(|_| HighlightingAssets::from_binary()))
}
diff --git a/src/bin/bat/config.rs b/src/bin/bat/config.rs
index 9b8c8925..03fdbff7 100644
--- a/src/bin/bat/config.rs
+++ b/src/bin/bat/config.rs
@@ -38,7 +38,8 @@ pub fn generate_config_file() -> bat::error::Result<()> {
return Err(format!(
"Unable to write config file to: {}",
config_file.to_string_lossy()
- ).into());
+ )
+ .into());
}
}
}
diff --git a/src/preprocessor.rs b/src/preprocessor.rs
index 373efc2f..f6c3d3f3 100644
--- a/src/preprocessor.rs
+++ b/src/preprocessor.rs
@@ -36,7 +36,10 @@ pub fn expand_tabs(line: &str, width: usize, cursor: &mut usize) -> String {
fn try_parse_utf8_char(input: &[u8]) -> Option<(char, usize)> {
let str_from_utf8 = |seq| std::str::from_utf8(seq).ok();
- let decoded = input.get(0..1).and_then(str_from_utf8).map(|c| (c, 1))
+ let decoded = input
+ .get(0..1)
+ .and_then(str_from_utf8)
+ .map(|c| (c, 1))
.or_else(|| input.get(0..2).and_then(str_from_utf8).map(|c| (c, 2)))
.or_else(|| input.get(0..3).and_then(str_from_utf8).map(|c| (c, 3)))
.or_else(|| input.get(0..4).and_then(str_from_utf8).map(|c| (c, 4)));