on master help sign in
HighlightingAssets: Simplify absolute_path with .map_or_else()
commit82f439e71561a423f23e1d09bde98e72569c68b6 authorMartin Nordholts <enselic@gmail.com> dateThu 16 Sep 2021, 17:02 (5 years ago) parentb034879
1 file changed+2−4
src/assets.rs+2−4
src/assets.rs+2−4
@@ -212,10 +212,8 @@ impl HighlightingAssets {
212212
213213 let path_syntax = if let Some(path) = path {
214214 // If a path was provided, we try and detect the syntax based on extension mappings.
215− let absolute_path = PathAbs::new(path)
216− .ok()
217− .map(|p| p.as_path().to_path_buf())
218− .unwrap_or_else(|| path.to_owned());
215+ let absolute_path =
216+ PathAbs::new(path).map_or_else(|_| path.to_owned(), |p| p.as_path().to_path_buf());
219217
220218 match mapping.get_syntax_for(absolute_path) {
221219 Some(MappingTarget::MapToUnknown) => {