/// 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()))?;
.expect_subtree()
.map_err(|()| ParseError::Expected("expected subtree".to_string()))?;
- let lhs = MetaTemplate(parse_pattern(&lhs)?);
- let rhs = MetaTemplate(parse_template(&rhs)?);
+ let lhs = MetaTemplate(parse_pattern(lhs)?);
+ let rhs = MetaTemplate(parse_template(rhs)?);
Ok(crate::Rule { lhs, rhs })
}
fn validate(pattern: &MetaTemplate) -> Result<(), ParseError> {
for op in pattern.iter() {
match op {
- Op::Subtree { tokens, .. } => validate(&tokens)?,
+ Op::Subtree { tokens, .. } => validate(tokens)?,
Op::Repeat { tokens: subtree, separator, .. } => {
// Checks that no repetition which could match an empty token
// https://github.com/rust-lang/rust/blob/a58b1ed44f5e06976de2bdc4d7dc81c36a96934f/src/librustc_expand/mbe/macro_rules.rs#L558
- if separator.is_none() {
- if subtree.iter().all(|child_op| {
+ if separator.is_none()
+ && subtree.iter().all(|child_op| {
match child_op {
Op::Var { kind, .. } => {
// vis is optional
Op::Subtree { .. } => {}
}
false
- }) {
- return Err(ParseError::RepetitionEmptyTokenTree);
- }
+ })
+ {
+ return Err(ParseError::RepetitionEmptyTokenTree);
}
validate(subtree)?
}
}
pub fn result(self) -> Result<T, ExpandError> {
- self.err.map(Err).unwrap_or(Ok(self.value))
+ self.err.map_or(Ok(self.value), Err)
}
}