This commit is contained in:
Folkert 2021-03-13 22:43:01 +01:00
parent 361eb25562
commit adcb772949

View file

@ -518,6 +518,7 @@ impl<'a> ExprState<'a> {
} }
} }
#[allow(clippy::unnecessary_wraps)]
fn parse_expr_final<'a>( fn parse_expr_final<'a>(
_min_indent: u16, _min_indent: u16,
expr_state: ExprState<'a>, expr_state: ExprState<'a>,
@ -661,7 +662,7 @@ fn parse_expr_operator<'a>(
expr_state.spaces_after = spaces; expr_state.spaces_after = spaces;
expr_state.end = new_end; expr_state.end = new_end;
parse_expr_end2(min_indent, expr_state, arena, state) parse_expr_end(min_indent, expr_state, arena, state)
} }
BinOp::Assignment => { BinOp::Assignment => {
if !expr_state.operators.is_empty() { if !expr_state.operators.is_empty() {
@ -730,14 +731,14 @@ fn parse_expr_operator<'a>(
let loc_def = &*arena.alloc(Located::at(alias_region, alias)); let loc_def = &*arena.alloc(Located::at(alias_region, alias));
let foo = space0_before_e( let parse_final_expr = space0_before_e(
move |a, s| parse_expr_help(min_indent, a, s), move |a, s| parse_expr_help(min_indent, a, s),
min_indent, min_indent,
EExpr::Space, EExpr::Space,
EExpr::IndentEnd, EExpr::IndentEnd,
); );
let (_, loc_ret, state) = foo.parse(arena, state)?; let (_, loc_ret, state) = parse_final_expr.parse(arena, state)?;
return Ok(( return Ok((
MadeProgress, MadeProgress,
@ -777,14 +778,14 @@ fn parse_expr_operator<'a>(
let loc_def = &*arena.alloc(Located::at(alias_region, alias)); let loc_def = &*arena.alloc(Located::at(alias_region, alias));
let foo = space0_before_e( let parse_final_expr = space0_before_e(
move |a, s| parse_expr_help(min_indent, a, s), move |a, s| parse_expr_help(min_indent, a, s),
min_indent, min_indent,
EExpr::Space, EExpr::Space,
EExpr::IndentEnd, EExpr::IndentEnd,
); );
let (_, loc_ret, state) = foo.parse(arena, state)?; let (_, loc_ret, state) = parse_final_expr.parse(arena, state)?;
return Ok(( return Ok((
MadeProgress, MadeProgress,
@ -854,7 +855,7 @@ fn parse_expr_operator<'a>(
} }
} }
fn parse_expr_end2<'a>( fn parse_expr_end<'a>(
min_indent: u16, min_indent: u16,
mut expr_state: ExprState<'a>, mut expr_state: ExprState<'a>,
arena: &'a Bump, arena: &'a Bump,
@ -942,15 +943,6 @@ fn parse_expr_end2<'a>(
} }
} }
fn parse_expr_end<'a>(
min_indent: u16,
expr_state: ExprState<'a>,
arena: &'a Bump,
state: State<'a>,
) -> ParseResult<'a, Expr<'a>, EExpr<'a>> {
return parse_expr_end2(min_indent, expr_state, arena, state);
}
fn parse_expr_help<'a>( fn parse_expr_help<'a>(
min_indent: u16, min_indent: u16,
arena: &'a Bump, arena: &'a Bump,