/// Shift given TokenTree token id
fn shift_all(self, tt: &mut tt::Subtree) {
- for t in tt.token_trees.iter_mut() {
+ for t in &mut tt.token_trees {
match t {
tt::TokenTree::Leaf(leaf) => match leaf {
tt::Leaf::Ident(ident) => ident.id = self.shift(ident.id),
}
}
- for rule in rules.iter() {
+ for rule in &rules {
validate(&rule.lhs)?;
}
}
rules.push(rule);
}
- for rule in rules.iter() {
+ for rule in &rules {
validate(&rule.lhs)?;
}
}
impl Rule {
- fn parse(src: &mut TtIter, expect_arrow: bool) -> Result<Rule, ParseError> {
+ fn parse(src: &mut TtIter, expect_arrow: bool) -> Result<Self, ParseError> {
let lhs = src
.expect_subtree()
.map_err(|()| ParseError::Expected("expected subtree".to_string()))?;
}
pub fn result(self) -> Result<T, ExpandError> {
- self.err.map(Err).unwrap_or(Ok(self.value))
+ self.err.map_or(Ok(self.value), Err)
}
}