Skip to content

impl Step for char (make Range*<char> iterable) #72413

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

Merged
merged 5 commits into from
May 30, 2020
Merged

impl Step for char (make Range*<char> iterable) #72413

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96f3879
impl Step for char
CAD97 May 21, 2020
c25b82f
Use Step::forward_unchecked in RangeInclusive::next
CAD97 May 21, 2020
27d1cd8
Add safety annotations in iter::range
CAD97 May 21, 2020
b1d1f25
Add a test for char ranges
CAD97 May 21, 2020
cd6a8ca
FIx off-by-one in char::steps_between
CAD97 May 28, 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
Use Step::forward_unchecked in RangeInclusive::next
  • Loading branch information
@CAD97
CAD97 committed May 21, 2020
commit c25b82f5bb9770374db31906dedb497034a151fd
6 changes: 5 additions & 1 deletion src/libcore/iter/range.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,11 @@ impl<A: Step> Iterator for ops::RangeInclusive<A> {
}
let is_iterating = self.start < self.end;
Some(if is_iterating {
let n = Step::forward(self.start.clone(), 1);
// SAFETY: just checked precondition
// We use the unchecked version here, because
// otherwise `for _ in '\0'..=char::MAX`
// does not successfully remove panicking code.
let n = unsafe { Step::forward_unchecked(self.start.clone(), 1) };
mem::replace(&mut self.start, n)
} else {
self.exhausted = true;
Expand Down