summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Peter <sharkdp@users.noreply.github.com>2021-07-08 23:00:11 +0300
committerDavid Peter <sharkdp@users.noreply.github.com>2021-07-09 06:34:11 +0200
commit21338ed7897a3c7dd3319861d2c7ed35c4fbeb58 (patch)
treec818152106d366eb1e27dc3a1fd36bb3424634a2
parentdc8ab0b5ce6d9cf0f09a3c86c43312a8ebf2fbfc (diff)
Abort ignored filename suffix stripping early on unworkable filenames
-rw-r--r--src/assets.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/assets.rs b/src/assets.rs
index a28ee272..0a730cf6 100644
--- a/src/assets.rs
+++ b/src/assets.rs
@@ -291,10 +291,11 @@ impl HighlightingAssets {
.and_then(|x| x.to_str())
.unwrap_or_default(),
).or_else(|| {
- let file_str = file_path.to_str().unwrap_or_default();
- 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));
+ 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