Skip to content

Update from upstream 1f399d0, prepare for rust-lang/rust#124056 #13

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

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

Update from upstream 1f399d0, prepare for rust-lang/rust#124056 #13

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
19 changes: 11 additions & 8 deletions src/range.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,13 +213,13 @@ macro_rules! indexed_range_impl {
}

trait UnindexedRangeLen<L> {
fn len(&self) -> L;
fn unindexed_len(&self) -> L;
}

macro_rules! unindexed_range_impl {
( $t:ty, $len_t:ty ) => {
impl UnindexedRangeLen<$len_t> for Range<$t> {
fn len(&self) -> $len_t {
fn unindexed_len(&self) -> $len_t {
let &Range { start, end } = self;
if end > start {
end.wrapping_sub(start) as $len_t
Expand Down Expand Up @@ -253,15 +253,15 @@ macro_rules! unindexed_range_impl {
}

fn opt_len(iter: &Iter<$t>) -> Option<usize> {
usize::try_from(iter.range.len()).ok()
usize::try_from(iter.range.unindexed_len()).ok()
}
}

impl UnindexedProducer for IterProducer<$t> {
type Item = $t;

fn split(mut self) -> (Self, Option<Self>) {
let index = self.range.len() / 2;
let index = self.range.unindexed_len() / 2;
if index > 0 {
let mid = self.range.start.wrapping_add(index as $t);
let right = mid..self.range.end;
Expand Down Expand Up @@ -387,11 +387,14 @@ fn test_i128_len_doesnt_overflow() {
range: 0..octillion,
};

assert_eq!(octillion as u128, producer.range.len());
assert_eq!(octillion as u128, (0..octillion).len());
assert_eq!(2 * octillion as u128, (-octillion..octillion).len());
assert_eq!(octillion as u128, producer.range.unindexed_len());
assert_eq!(octillion as u128, (0..octillion).unindexed_len());
assert_eq!(
2 * octillion as u128,
(-octillion..octillion).unindexed_len()
);

assert_eq!(u128::MAX, (i128::MIN..i128::MAX).len());
assert_eq!(u128::MAX, (i128::MIN..i128::MAX).unindexed_len());
}

#[test]
Expand Down