@@ -63,15 +63,15 @@ fn run_cache_subcommand(matches: &clap::ArgMatches) -> Result<()> {
6363}
6464
6565fn get_syntax_mapping_to_paths(
66− mappings: Vec<(GlobMatcher, MappingTarget)>,
66+ mappings: &[(GlobMatcher, MappingTarget)],
6767) -> HashMap<String, Vec<String>> {
68− let mut map = HashMap::new();
68+ let mut map: HashMap<String, Vec<String>> = HashMap::new();
6969 for mapping in mappings {
70− match mapping.1 {
71− MappingTarget::MapToUnknown => {}
72− MappingTarget::MapTo(s) => {
73− let globs = map.entry(s.into()).or_insert(Vec::new());
74− globs.push(mapping.0.glob().glob().into());
70+ match mapping {
71+ (_, MappingTarget::MapToUnknown) => {}
72+ (matcher, MappingTarget::MapTo(s)) => {
73+ let globs = map.entry((*s).into()).or_insert(Vec::new());
74+ globs.push(matcher.glob().glob().into());
7575 }
7676 }
7777 }
@@ -88,14 +88,15 @@ pub fn list_languages(config: &Config) -> Result<()> {
8888 .collect::<Vec<_>>();
8989 languages.sort_by_key(|lang| lang.name.to_uppercase());
9090
91− let configured_languages =
92− get_syntax_mapping_to_paths(config.syntax_mapping.mappings().clone());
91+ let configured_languages = get_syntax_mapping_to_paths(config.syntax_mapping.mappings());
9392
9493 for lang in languages.iter_mut() {
95− if configured_languages.contains_key(&lang.name) {
96− let additional_paths = configured_languages.get(&lang.name).unwrap();
97− lang.file_extensions
98− .extend(additional_paths.iter().cloned());
94+ match configured_languages.get(&lang.name) {
95+ Some(additional_paths) => {
96+ lang.file_extensions
97+ .extend(additional_paths.iter().cloned());
98+ }
99+ None => {}
99100 }
100101 }
101102