From dc8ab0b5ce6d9cf0f09a3c86c43312a8ebf2fbfc Mon Sep 17 00:00:00 2001
From: David Peter <sharkdp@users.noreply.github.com>
Date: Thu, 8 Jul 2021 22:55:45 +0300
Subject: [PATCH] Simplify ignored filename suffix stripping
---
src/assets.rs | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/assets.rs b/src/assets.rs
index b09ced21..a28ee272 100644
--- a/src/assets.rs
+++ b/src/assets.rs
@@ -293,13 +293,8 @@ impl HighlightingAssets {
).or_else(|| {
let file_str = file_path.to_str().unwrap_or_default();
for suffix in IGNORED_SUFFIXES.iter() {
- if file_str.ends_with(suffix) {
- return self.get_extension_syntax(
- OsStr::new(
- file_str
- .strip_suffix(suffix)
- .unwrap_or_default()
- ));
+ if let Some(stripped_filename) = file_str.strip_suffix(suffix) {
+ return self.get_extension_syntax(OsStr::new(stripped_filename));
}
}
None