summaryrefslogtreecommitdiff
path: root/src/syntax
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2020-08-27 21:47:26 +0200
committerLaurenz <laurmaedje@gmail.com>2020-08-27 21:47:26 +0200
commit2a92428ff6986d8e564b7c223f3d0c5ca0eacaf1 (patch)
tree4545b5b598aa95cb23b6737884b5b6e2ee8c0a33 /src/syntax
parent37835e4d8e5029c857ba4f11b8c2a09563423746 (diff)
Do as Dolores says ⚡
Diffstat (limited to 'src/syntax')
-rw-r--r--src/syntax/parsing.rs14
-rw-r--r--src/syntax/tokens.rs2
2 files changed, 8 insertions, 8 deletions
diff --git a/src/syntax/parsing.rs b/src/syntax/parsing.rs
index 96db687d..29a9d788 100644
--- a/src/syntax/parsing.rs
+++ b/src/syntax/parsing.rs
@@ -67,7 +67,7 @@ impl Parser<'_> {
}
Token::LeftBracket => {
- self.parse_bracket_call(false).map(|c| SyntaxNode::Call(c))
+ self.parse_bracket_call(false).map(SyntaxNode::Call)
}
Token::Star => self.with_span(SyntaxNode::ToggleBolder),
@@ -143,7 +143,7 @@ impl Parser<'_> {
let (has_chained_child, end) = if self.peek().is_some() {
let item = self.parse_bracket_call(true);
let span = item.span;
- let t = vec![item.map(|f| SyntaxNode::Call(f))];
+ let t = vec![item.map(SyntaxNode::Call)];
args.push(SpannedEntry::val(Spanned::new(Expr::Tree(t), span)));
(true, span.end)
} else {
@@ -203,10 +203,10 @@ impl Parser<'_> {
Some(Token::LeftParen) => {
let call = self.parse_paren_call(ident);
- (None, call.map(|c| Expr::Call(c)))
+ (None, call.map(Expr::Call))
}
- _ => (None, ident.map(|id| Expr::Ident(id)))
+ _ => (None, ident.map(Expr::Ident))
}
} else {
(None, try_or!(self.parse_expr(), {
@@ -316,9 +316,9 @@ impl Parser<'_> {
self.eat();
self.skip_white();
if self.check(Token::LeftParen) {
- self.parse_paren_call(name).map(|call| Expr::Call(call))
+ self.parse_paren_call(name).map(Expr::Call)
} else {
- name.map(|id| Expr::Ident(id))
+ name.map(Expr::Ident)
}
}
@@ -377,7 +377,7 @@ impl Parser<'_> {
// This is a bracketed function call.
Token::LeftBracket => {
let call = self.parse_bracket_call(false);
- let tree = vec![call.map(|c| SyntaxNode::Call(c))];
+ let tree = vec![call.map(SyntaxNode::Call)];
Spanned::new(Expr::Tree(tree), span)
}
diff --git a/src/syntax/tokens.rs b/src/syntax/tokens.rs
index 24d8ecfb..1dcf9022 100644
--- a/src/syntax/tokens.rs
+++ b/src/syntax/tokens.rs
@@ -478,7 +478,7 @@ pub fn is_identifier(string: &str) -> bool {
_ => return false,
}
- while let Some(c) = chars.next() {
+ for c in chars {
match c {
c if UnicodeXID::is_xid_continue(c) || is_extra_allowed(c) => {}
_ => return false,