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

Redesign the std::iter::Step trait, tweak related iterator impls for ranges #43127

Closed
wants to merge 11 commits into from
Closed

Redesign the std::iter::Step trait, tweak related iterator impls for ranges #43127

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d103522
Check integer overflow/underflow in Range* iterators
SimonSapin Jul 6, 2017
3e8a762
Don’t reset RangeInclusive to 1...0 after last iteration.
SimonSapin Jul 6, 2017
5334226
Rename Step::{add,sub}_usize to Step::forward and Step::backward
SimonSapin Jul 7, 2017
32d963e
Rewrite mixed-width mixed-signedness integer arithmetic in Step impls
SimonSapin Jul 7, 2017
9d4dc29
Add tests for Step trait methods
SimonSapin Jul 7, 2017
c0b4440
Implement TrustedLen for ranges of all integer types
SimonSapin Jul 8, 2017
b270e7f
Tighter size_hint lower bound for ranges larger than usize
SimonSapin Jul 8, 2017
287ce4c
Remove ExactSizeIterator impls for RangeInclusive<{i16,u16}>
SimonSapin Jul 8, 2017
eed9884
Add a comment on the `start > end` check in RangeInclusive::size_hint
SimonSapin Jul 8, 2017
0a62269
Make tidy happy
SimonSapin Jul 9, 2017
0ac7fca
Implement TrustedLen for ranges of all T: Step, make Step an unsafe t…
SimonSapin Jul 9, 2017
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
Tighter size_hint lower bound for ranges larger than usize
  • Loading branch information
@SimonSapin
SimonSapin committed Jul 24, 2017
commit b270e7f524c7a2ff41beb3bf93edf23e2ffc7e22
4 changes: 2 additions & 2 deletions src/libcore/iter/range.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ impl<A: Step> Iterator for ops::Range<A> {
// NOTE: the safety of `unsafe impl TrustedLen` depends on this being correct!
match Step::steps_between(&self.start, &self.end) {
Some(hint) => (hint, Some(hint)),
None => (0, None)
None => (usize::MAX, None)
}
}

Expand Down Expand Up @@ -410,7 +410,7 @@ impl<A: Step> Iterator for ops::RangeInclusive<A> {

match Step::steps_between(&self.start, &self.end) {
Some(hint) => (hint.saturating_add(1), hint.checked_add(1)),
None => (0, None),
None => (usize::MAX, None),
}
}

Expand Down