Skip to content

refactor some more iterators in speech.rs #867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moritz-gross wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor some more iterators in speech.rs #867

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions src/speech.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1002,11 +1002,9 @@ impl ReplacementArray {
}

let new_element = create_mathml_element(&rules_with_context.doc, "Unknown"); // Hopefully set later (in Intent::Replace())
let mut new_children = Vec::with_capacity(self.replacements.len());
for child in self.replacements.iter() {
let child = rules_with_context.replace::<Element<'m>>(child, mathml)?;
new_children.push(ChildOfElement::Element(child));
};
let new_children = self.replacements.iter()
.map(|child| Ok(ChildOfElement::Element(rules_with_context.replace::<Element<'m>>(child, mathml)?)))
.collect::<Result<Vec<_>>>()?;
new_element.append_children(new_children);
return Ok(new_element);
}
Expand Down Expand Up @@ -1710,13 +1708,10 @@ impl VariableDefinitions {
return Ok( VariableDefinitions::new(0) );
};
if let Some(defs) = defs.as_vec() {
let mut definitions = VariableDefinitions::new(defs.len());
for def in defs {
let variable_def = VariableDefinition::build(def)
.context("definition of 'variables'")?;
definitions.push( variable_def);
};
return Ok (definitions );
let defs = defs.iter()
.map(|def| VariableDefinition::build(def).context("definition of 'variables'"))
.collect::<Result<Vec<_>>>()?;
return Ok( VariableDefinitions{ defs } );
}
bail!( "'variables' is not an array of {{name: xpath-value}} definitions. Found {}'",
yaml_to_string(defs, 1) );
Expand Down
Loading