From d90ecfd4d7459aa54cfc108646021a11cda60e79 Mon Sep 17 00:00:00 2001 From: Alek Ratzloff Date: Wed, 6 May 2020 18:04:07 -0400 Subject: [PATCH] cargo fmt Signed-off-by: Alek Ratzloff --- src/syn/parser.rs | 89 ++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 52 deletions(-) diff --git a/src/syn/parser.rs b/src/syn/parser.rs index 2a56a06..538b400 100644 --- a/src/syn/parser.rs +++ b/src/syn/parser.rs @@ -174,11 +174,7 @@ impl<'t> Parser<'t> { next_dot_expr ); // . - bin_expr!( - next_dot_expr, - &[TokenKind::Dot], - next_un_expr - ); + bin_expr!(next_dot_expr, &[TokenKind::Dot], next_un_expr); fn next_un_expr(&mut self) -> Result { if let Some(un_op) = self.match_any_token_kind(&UN_EXPR_START)? { @@ -296,29 +292,19 @@ impl<'t> Parser<'t> { let end_token = self.expect_token_kind(TokenKind::RParen, "end of function call (right paren)")?; let span = expr.span().union(end_token.span()); - let fun_call = Expr::FunCall( - FunCallExpr { - expr, - args, - span, - }.into() - ); + let fun_call = Expr::FunCall(FunCallExpr { expr, args, span }.into()); self.next_suffix_expr(fun_call) } else if self.match_token_kind(TokenKind::LBracket)?.is_some() { // indexing let prev_skip = self.set_skip_newlines(true)?; let index = self.next_expr()?; self.set_skip_newlines(prev_skip)?; - let end_token = - self.expect_token_kind(TokenKind::RBracket, "end of index expression (right square bracket)")?; + let end_token = self.expect_token_kind( + TokenKind::RBracket, + "end of index expression (right square bracket)", + )?; let span = expr.span().union(end_token.span()); - let index_expr = Expr::Index( - IndexExpr { - expr, - index, - span, - }.into() - ); + let index_expr = Expr::Index(IndexExpr { expr, index, span }.into()); self.next_suffix_expr(index_expr) } else { Ok(expr) @@ -617,19 +603,25 @@ mod test { } fn fun_call_expr(expr: Expr, args: Vec) -> Expr { - Expr::FunCall(FunCallExpr { - expr, - args, - span: Default::default(), - }.into()) + Expr::FunCall( + FunCallExpr { + expr, + args, + span: Default::default(), + } + .into(), + ) } fn index_expr(expr: Expr, index: Expr) -> Expr { - Expr::Index(IndexExpr { - expr, - index, - span: Default::default(), - }.into()) + Expr::Index( + IndexExpr { + expr, + index, + span: Default::default(), + } + .into(), + ) } #[test] @@ -861,7 +853,10 @@ mod test { bin_expr( fun_call_expr(base_expr(BaseExprKind::Ident), vec![]), BinOp::Dot, - fun_call_expr(base_expr(BaseExprKind::Ident), vec![base_expr(BaseExprKind::Ident)]), + fun_call_expr( + base_expr(BaseExprKind::Ident), + vec![base_expr(BaseExprKind::Ident)] + ), ) ) ); @@ -975,10 +970,7 @@ mod test { test_parser!( Parser::try_from(r"foo()").unwrap(), next_expr, - fun_call_expr( - base_expr(BaseExprKind::Ident), - vec![] - ) + fun_call_expr(base_expr(BaseExprKind::Ident), vec![]) ); test_parser!( @@ -986,9 +978,7 @@ mod test { next_expr, fun_call_expr( base_expr(BaseExprKind::Ident), - vec![ - base_expr(BaseExprKind::Ident) - ] + vec![base_expr(BaseExprKind::Ident)] ) ); @@ -1006,11 +996,14 @@ mod test { ); test_parser!( - Parser::try_from(r"foo( + Parser::try_from( + r"foo( bar, 1, :sym - )").unwrap(), + )" + ) + .unwrap(), next_expr, fun_call_expr( base_expr(BaseExprKind::Ident), @@ -1026,10 +1019,7 @@ mod test { Parser::try_from(r"foo()[0]").unwrap(), next_expr, index_expr( - fun_call_expr( - base_expr(BaseExprKind::Ident), - vec![] - ), + fun_call_expr(base_expr(BaseExprKind::Ident), vec![]), base_expr(BaseExprKind::Num), ) ); @@ -1038,13 +1028,8 @@ mod test { Parser::try_from(r"foo[0](bar)").unwrap(), next_expr, fun_call_expr( - index_expr( - base_expr(BaseExprKind::Ident), - base_expr(BaseExprKind::Num), - ), - vec![ - base_expr(BaseExprKind::Ident) - ] + index_expr(base_expr(BaseExprKind::Ident), base_expr(BaseExprKind::Num),), + vec![base_expr(BaseExprKind::Ident)] ) ); }