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

Add Iterator::intersperse #75784

Closed
wants to merge 8 commits into from
Closed

Add Iterator::intersperse #75784

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
13d5e6d
Add Iterator::intersperse
jonas-schievink Aug 21, 2020
8a05fbc
Update library/core/src/iter/adapters/intersperse.rs
jonas-schievink Aug 22, 2020
f470155
Address review comments
jonas-schievink Aug 22, 2020
97039d8
Implement `size_hint`
jonas-schievink Aug 22, 2020
572b795
Update library/core/src/iter/adapters/intersperse.rs
jonas-schievink Aug 24, 2020
00ad5c8
Rewrite and add tests, address remaining comments
jonas-schievink Sep 6, 2020
d3122a8
Remove incorrect `try_fold` and add more tests
jonas-schievink Sep 11, 2020
3a069a0
Improve `size_hint`
jonas-schievink Sep 11, 2020
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
Prev Previous commit
Next Next commit
Implement size_hint
  • Loading branch information
@jonas-schievink
jonas-schievink committed Sep 11, 2020
commit 97039d81a71cb1722571eb50a5c3dc63b5fd36a6
10 changes: 10 additions & 0 deletions library/core/src/iter/adapters/intersperse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,14 @@ where
accum
})
}

fn size_hint(&self) -> (usize, Option<usize>) {
// We'll yield the whole `self.iter`, and just as many separators, as well as (if present)
// `self.peek`.
let (lo, hi) = self.iter.size_hint();
let has_peek = self.peek.is_some() as usize;
let lo = lo.saturating_add(lo).saturating_add(has_peek);
let hi = hi.map(|hi| hi.saturating_add(hi).saturating_add(has_peek));
(lo, hi)
}
}