summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Peter <mail@david-peter.de>2021-07-13 08:19:59 +0200
committerDavid Peter <mail@david-peter.de>2021-07-13 08:19:59 +0200
commit33c11d64f016cd6890906a169d64baf7c8bf6040 (patch)
treeb8001ed3cc6af6f2ccc36d46320f66477987991f
parenta4b674902f26a606531ec3301fc7b240ad750204 (diff)
Run cargo fmt
-rw-r--r--src/assets.rs41
1 files changed, 25 insertions, 16 deletions
diff --git a/src/assets.rs b/src/assets.rs
index 0a730cf6..a373b270 100644
--- a/src/assets.rs
+++ b/src/assets.rs
@@ -25,11 +25,17 @@ pub struct HighlightingAssets {
const IGNORED_SUFFIXES: [&str; 10] = [
// Editor etc backups
- "~", ".bak", ".old", ".orig",
+ "~",
+ ".bak",
+ ".old",
+ ".orig",
// Debian and derivatives apt/dpkg backups
- ".dpkg-dist", ".dpkg-old",
+ ".dpkg-dist",
+ ".dpkg-old",
// Red Hat and derivatives rpm backups
- ".rpmnew", ".rpmorig", ".rpmsave",
+ ".rpmnew",
+ ".rpmorig",
+ ".rpmsave",
// Build system input/template files
".in",
];
@@ -285,21 +291,24 @@ impl HighlightingAssets {
.find_syntax_by_extension(file_name.to_str().unwrap_or_default())
.or_else(|| {
let file_path = Path::new(file_name);
- self.syntax_set.find_syntax_by_extension(
- file_path
- .extension()
- .and_then(|x| x.to_str())
- .unwrap_or_default(),
- ).or_else(|| {
- if let Some(file_str) = file_path.to_str() {
- for suffix in IGNORED_SUFFIXES.iter() {
- if let Some(stripped_filename) = file_str.strip_suffix(suffix) {
- return self.get_extension_syntax(OsStr::new(stripped_filename));
+ self.syntax_set
+ .find_syntax_by_extension(
+ file_path
+ .extension()
+ .and_then(|x| x.to_str())
+ .unwrap_or_default(),
+ )
+ .or_else(|| {
+ if let Some(file_str) = file_path.to_str() {
+ for suffix in IGNORED_SUFFIXES.iter() {
+ if let Some(stripped_filename) = file_str.strip_suffix(suffix) {
+ return self
+ .get_extension_syntax(OsStr::new(stripped_filename));
+ }
}
}
- }
- None
- })
+ None
+ })
})
}