From a5da770ec60a73abcc5350f25146be973540063f Mon Sep 17 00:00:00 2001 From: Alan Du Date: Wed, 17 Oct 2018 19:25:37 -0400 Subject: Fix function calls --- crates/ra_syntax/src/lexer/ptr.rs | 2 +- crates/ra_syntax/src/reparsing.rs | 2 +- crates/ra_syntax/src/utils.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/ra_syntax') diff --git a/crates/ra_syntax/src/lexer/ptr.rs b/crates/ra_syntax/src/lexer/ptr.rs index fa79d8862..4c291b9c4 100644 --- a/crates/ra_syntax/src/lexer/ptr.rs +++ b/crates/ra_syntax/src/lexer/ptr.rs @@ -31,7 +31,7 @@ impl<'s> Ptr<'s> { /// For example, 0 will return the current token, 1 will return the next, etc. pub fn nth(&self, n: u32) -> Option { let mut chars = self.chars().peekable(); - chars.by_ref().skip(n as usize).next() + chars.by_ref().nth(n as usize) } /// Checks whether the current character is `c`. diff --git a/crates/ra_syntax/src/reparsing.rs b/crates/ra_syntax/src/reparsing.rs index 377152de4..eae01b1d5 100644 --- a/crates/ra_syntax/src/reparsing.rs +++ b/crates/ra_syntax/src/reparsing.rs @@ -135,7 +135,7 @@ fn find_reparsable_node( } fn is_balanced(tokens: &[Token]) -> bool { - if tokens.len() == 0 + if tokens.is_empty() || tokens.first().unwrap().kind != L_CURLY || tokens.last().unwrap().kind != R_CURLY { diff --git a/crates/ra_syntax/src/utils.rs b/crates/ra_syntax/src/utils.rs index ca4160378..8ee02724d 100644 --- a/crates/ra_syntax/src/utils.rs +++ b/crates/ra_syntax/src/utils.rs @@ -5,7 +5,7 @@ use std::fmt::Write; /// Parse a file and create a string representation of the resulting parse tree. pub fn dump_tree(syntax: SyntaxNodeRef) -> String { - let mut errors: Vec<_> = syntax.root_data().iter().cloned().collect(); + let mut errors: Vec<_> = syntax.root_data().to_vec(); errors.sort_by_key(|e| e.offset); let mut err_pos = 0; let mut level = 0; -- cgit v1.2.3