Skip to content

Commit

Permalink
Fix overflow error on union
Browse files Browse the repository at this point in the history
  • Loading branch information
alexvbrdn committed Sep 5, 2024
1 parent 35d7240 commit 1e53172
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "irange"
version = "1.1.1"
version = "1.1.2"
edition = "2021"
authors = ["Alexandre van Beurden"]
repository = "https://github.com/alexvbrdn/irange"
Expand Down
22 changes: 17 additions & 5 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,12 @@ impl<T: NumericInteger> RangeSet<T> {

self_i += 2;
}
current_min = new_range[new_range.len() - 2];
current_max = new_range[new_range.len() - 1];
if current_max == T::max_value() {
break;
}
current_i = Some(new_range.len() - 2);
current_min = new_range[current_i.unwrap()];
current_max = new_range[current_i.unwrap() + 1];
}

new_range.shrink_to_fit();
Expand Down Expand Up @@ -750,6 +753,17 @@ mod tests {
.union(&RangeSet(vec![97, 97]))
.0
);

let range1 = RangeSet::new_from_ranges(&[
AnyRange::from(..=12),
AnyRange::from(15..=15),
AnyRange::from(18..),
]);
let range2 = RangeSet::new_from_ranges(&[AnyRange::from(..=12), AnyRange::from(15..)]);

let range3 = RangeSet::new_from_ranges(&[AnyRange::from(..=12), AnyRange::from(15..)]);
assert_eq!(range3, range1.union(&range2));

Ok(())
}

Expand Down Expand Up @@ -892,8 +906,6 @@ mod tests {
#[test]
#[cfg(feature = "serde")]
fn serde_test() {
serde_test!(
u8, u16, u32, u64, u128, usize, i8, i16, i32, i64, i128, isize
);
serde_test!(u8, u16, u32, u64, u128, usize, i8, i16, i32, i64, i128, isize);
}
}

0 comments on commit 1e53172

Please sign in to comment.