Robot
/
bat
mirror of https://github.com/sharkdp/bat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

`MappingDefModel::into_mapping_list` returns `MappingList`

This commit is contained in:
cyqsimon 2023-11-02 16:33:56 +08:00
parent d1bc0ef0d4
commit 97780f987e
No known key found for this signature in database
GPG Key ID: 1D8CE2F297390D65
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/syntax_mapping.rs
View File

@ -42,8 +42,9 @@ struct MappingDefModel {
mappings: IndexMap<MappingTarget, Vec<String>>, mappings: IndexMap<MappingTarget, Vec<String>>,
} }
impl MappingDefModel { impl MappingDefModel {
fn into_mapping_list(self) -> Vec<(String, MappingTarget)> { fn into_mapping_list(self) -> MappingList {
self.mappings let list = self
.mappings
.into_iter() .into_iter()
.flat_map(|(target, matcher)| { .flat_map(|(target, matcher)| {
matcher matcher
@ -51,7 +52,8 @@ impl MappingDefModel {
.map(|rule| (rule, target.clone())) .map(|rule| (rule, target.clone()))
.collect::<Vec<_>>() .collect::<Vec<_>>()
}) })
.collect() .collect();
MappingList(list)
} }
} }
@ -86,7 +88,7 @@ fn read_all_mappings() -> anyhow::Result<MappingList> {
{ {
let toml_string = fs::read_to_string(entry.path())?; let toml_string = fs::read_to_string(entry.path())?;
let mappings = toml::from_str::<MappingDefModel>(&toml_string)?.into_mapping_list(); let mappings = toml::from_str::<MappingDefModel>(&toml_string)?.into_mapping_list();
all_mappings.extend(mappings); all_mappings.extend(mappings.0);
} }
Ok(MappingList(all_mappings)) Ok(MappingList(all_mappings))