Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: make ErasedSegment::recursive_crawl_all return Iterator instead of Vec #1249

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: make ErasedSegment::recursive_crawl_all return Iterator instead of Vec #1249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions crates/lib-core/src/parser/segments/base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ impl ErasedSegment {

pub fn get_raw_segments(&self) -> Vec<ErasedSegment> {
self.recursive_crawl_all(false)
.into_iter()
.filter(|it| it.segments().is_empty())
.collect()
}
Expand Down Expand Up @@ -618,22 +617,26 @@ impl ErasedSegment {
)
}

pub fn recursive_crawl_all(&self, reverse: bool) -> Vec<ErasedSegment> {
let mut result = Vec::with_capacity(self.segments().len() + 1);
pub fn recursive_crawl_all(&self, reverse: bool) -> impl Iterator<Item = ErasedSegment> + '_ {
let self_clone = self.clone();

if reverse {
for seg in self.segments().iter().rev() {
result.append(&mut seg.recursive_crawl_all(reverse));
}
result.push(self.clone());
Box::new(
self.segments()
.iter()
.rev()
.flat_map(move |seg| seg.recursive_crawl_all(reverse))
.chain(std::iter::once(self_clone)),
) as Box<dyn Iterator<Item = _>>
} else {
result.push(self.clone());
for seg in self.segments() {
result.append(&mut seg.recursive_crawl_all(reverse));
}
Box::new(
std::iter::once(self_clone).chain(
self.segments()
.iter()
.flat_map(move |seg| seg.recursive_crawl_all(reverse)),
),
) as Box<dyn Iterator<Item = _>>
}

result
}

pub fn raw_segments_with_ancestors(&self) -> &[(ErasedSegment, Vec<PathStep>)] {
Expand Down
6 changes: 1 addition & 5 deletions crates/lib/src/rules/structure/st05.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,11 +574,7 @@ impl CTEBuilder {
clone_map: &SegmentCloneMap,
) {
for (idx, cte) in enumerate(&self.ctes) {
if cte
.recursive_crawl_all(false)
.into_iter()
.any(|seg| segment.is(&seg))
{
if cte.recursive_crawl_all(false).any(|seg| segment.is(&seg)) {
self.ctes[idx] = clone_map[&self.ctes[idx]].clone();
return;
}
Expand Down
Loading