rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

replace usages of algo::generate with iter::successors from std

Browse Source
This commit is contained in:
Robin Freyler
2019-04-13 16:43:49 +02:00
parent 8887782c4a
commit 6aae0cf7fa
6 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/ra_syntax/src/syntax_node.rs
View File

@@ -10,6 +10,7 @@ use std::{
fmt::{self, Write},
any::Any,
borrow::Borrow,
iter::successors,
};
use ra_parser::ParseError;
@@ -195,7 +196,7 @@ impl SyntaxNode {
}
pub fn ancestors(&self) -> impl Iterator<Item = &SyntaxNode> {
crate::algo::generate(Some(self), |&node| node.parent())
successors(Some(self), |&node| node.parent())
}
pub fn descendants(&self) -> impl Iterator<Item = &SyntaxNode> {
@@ -213,7 +214,7 @@ impl SyntaxNode {
}
pub fn siblings(&self, direction: Direction) -> impl Iterator<Item = &SyntaxNode> {
crate::algo::generate(Some(self), move |&node| match direction {
successors(Some(self), move |&node| match direction {
Direction::Next => node.next_sibling(),
Direction::Prev => node.prev_sibling(),
})
@@ -224,7 +225,7 @@ impl SyntaxNode {
direction: Direction,
) -> impl Iterator<Item = SyntaxElement> {
let me: SyntaxElement = self.into();
crate::algo::generate(Some(me), move |el| match direction {
successors(Some(me), move |el| match direction {
Direction::Next => el.next_sibling_or_token(),
Direction::Prev => el.prev_sibling_or_token(),
})
@@ -373,7 +374,7 @@ impl<'a> SyntaxToken<'a> {
direction: Direction,
) -> impl Iterator<Item = SyntaxElement<'a>> {
let me: SyntaxElement = (*self).into();
crate::algo::generate(Some(me), move |el| match direction {
successors(Some(me), move |el| match direction {
Direction::Next => el.next_sibling_or_token(),
Direction::Prev => el.prev_sibling_or_token(),
})