Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7818fa2 authored by Chris Wailes's avatar Chris Wailes Committed by Gerrit Code Review
Browse files

Merge "Update Android source for Rust 1.67.1"

parents 2c8e59c3 9ebfa475

tools/pdl/src/parser.rs

+3 −6
Original line number Diff line number Diff line
@@ -412,16 +412,13 @@ fn parse_field(node: Node<'_>, context: &Context) -> Result<ast::Field, String> 
    })

}



fn parse_field_list<'i>(

    iter: &mut NodeIterator<'i>,

    context: &Context,

) -> Result<Vec<ast::Field>, String> {

fn parse_field_list(iter: &mut NodeIterator, context: &Context) -> Result<Vec<ast::Field>, String> {

    expect(iter, Rule::field_list)

        .and_then(|n| n.children().map(|n| parse_field(n, context)).collect())

}



fn parse_field_list_opt<'i>(

    iter: &mut NodeIterator<'i>,

fn parse_field_list_opt(

    iter: &mut NodeIterator,

    context: &Context,

) -> Result<Vec<ast::Field>, String> {

    maybe(iter, Rule::field_list)