1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051
// SPDX-License-Identifier: MPL-2.0
//! Ranges are constraints defining sets of versions.
//!
//! Concretely, those constraints correspond to any set of versions
//! representable as the concatenation, union, and complement
//! of the ranges building blocks.
//!
//! Those building blocks are:
//! - [empty()](Range::empty): the empty set
//! - [full()](Range::full): the set of all possible versions
//! - [singleton(v)](Range::singleton): the set containing only the version v
//! - [higher_than(v)](Range::higher_than): the set defined by `v <= versions`
//! - [strictly_higher_than(v)](Range::strictly_higher_than): the set defined by `v < versions`
//! - [lower_than(v)](Range::lower_than): the set defined by `versions <= v`
//! - [strictly_lower_than(v)](Range::strictly_lower_than): the set defined by `versions < v`
//! - [between(v1, v2)](Range::between): the set defined by `v1 <= versions < v2`
//!
//! Ranges can be created from any type that implements [`Ord`] + [`Clone`].
//!
//! In order to advance the solver front, comparisons of versions sets are necessary in the algorithm.
//! To do those comparisons between two sets S1 and S2 we use the mathematical property that S1 ⊂ S2 if and only if S1 ∩ S2 == S1.
//! We can thus compute an intersection and evaluate an equality to answer if S1 is a subset of S2.
//! But this means that the implementation of equality must be correct semantically.
//! In practice, if equality is derived automatically, this means sets must have unique representations.
//!
//! By migrating from a custom representation for discrete sets in v0.2
//! to a generic bounded representation for continuous sets in v0.3
//! we are potentially breaking that assumption in two ways:
//!
//! 1. Minimal and maximal `Unbounded` values can be replaced by their equivalent if it exists.
//! 2. Simplifying adjacent bounds of discrete sets cannot be detected and automated in the generic intersection code.
//!
//! An example for each can be given when `T` is `u32`.
//! First, we can have both segments `S1 = (Unbounded, Included(42u32))` and `S2 = (Included(0), Included(42u32))`
//! that represent the same segment but are structurally different.
//! Thus, a derived equality check would answer `false` to `S1 == S2` while it's true.
//!
//! Second both segments `S1 = (Included(1), Included(5))` and `S2 = (Included(1), Included(3)) + (Included(4), Included(5))` are equal.
//! But without asking the user to provide a `bump` function for discrete sets,
//! the algorithm is not able tell that the space between the right `Included(3)` bound and the left `Included(4)` bound is empty.
//! Thus the algorithm is not able to reduce S2 to its canonical S1 form while computing sets operations like intersections in the generic code.
//!
//! This is likely to lead to user facing theoretically correct but practically nonsensical ranges,
//! like (Unbounded, Excluded(0)) or (Excluded(6), Excluded(7)).
//! In general nonsensical inputs often lead to hard to track bugs.
//! But as far as we can tell this should work in practice.
//! So for now this crate only provides an implementation for continuous ranges.
//! With the v0.3 api the user could choose to bring back the discrete implementation from v0.2, as documented in the guide.
//! If doing so regularly fixes bugs seen by users, we will bring it back into the core library.
//! If we do not see practical bugs, or we get a formal proof that the code cannot lead to error states, then we may remove this warning.
use crate::{internal::small_vec::SmallVec, version_set::VersionSet};
use std::borrow::Borrow;
use std::cmp::Ordering;
use std::ops::RangeBounds;
use std::{
fmt::{Debug, Display, Formatter},
ops::Bound::{self, Excluded, Included, Unbounded},
};
/// A Range represents multiple intervals of a continuous range of monotone increasing
/// values.
#[derive(Debug, Clone, Eq, PartialEq, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize))]
#[cfg_attr(feature = "serde", serde(transparent))]
pub struct Range<V> {
segments: SmallVec<Interval<V>>,
}
type Interval<V> = (Bound<V>, Bound<V>);
impl<V> Range<V> {
/// Empty set of versions.
pub fn empty() -> Self {
Self {
segments: SmallVec::empty(),
}
}
/// Set of all possible versions
pub fn full() -> Self {
Self {
segments: SmallVec::one((Unbounded, Unbounded)),
}
}
/// Set of all versions higher or equal to some version
pub fn higher_than(v: impl Into<V>) -> Self {
Self {
segments: SmallVec::one((Included(v.into()), Unbounded)),
}
}
/// Set of all versions higher to some version
pub fn strictly_higher_than(v: impl Into<V>) -> Self {
Self {
segments: SmallVec::one((Excluded(v.into()), Unbounded)),
}
}
/// Set of all versions lower to some version
pub fn strictly_lower_than(v: impl Into<V>) -> Self {
Self {
segments: SmallVec::one((Unbounded, Excluded(v.into()))),
}
}
/// Set of all versions lower or equal to some version
pub fn lower_than(v: impl Into<V>) -> Self {
Self {
segments: SmallVec::one((Unbounded, Included(v.into()))),
}
}
/// Set of versions greater or equal to `v1` but less than `v2`.
pub fn between(v1: impl Into<V>, v2: impl Into<V>) -> Self {
Self {
segments: SmallVec::one((Included(v1.into()), Excluded(v2.into()))),
}
}
/// Whether the set is empty, i.e. it has not ranges
pub fn is_empty(&self) -> bool {
self.segments.is_empty()
}
}
impl<V: Clone> Range<V> {
/// Set containing exactly one version
pub fn singleton(v: impl Into<V>) -> Self {
let v = v.into();
Self {
segments: SmallVec::one((Included(v.clone()), Included(v))),
}
}
/// Returns the complement of this Range.
pub fn complement(&self) -> Self {
match self.segments.first() {
// Complement of ∅ is ∞
None => Self::full(),
// Complement of ∞ is ∅
Some((Unbounded, Unbounded)) => Self::empty(),
// First high bound is +∞
Some((Included(v), Unbounded)) => Self::strictly_lower_than(v.clone()),
Some((Excluded(v), Unbounded)) => Self::lower_than(v.clone()),
Some((Unbounded, Included(v))) => {
Self::negate_segments(Excluded(v.clone()), &self.segments[1..])
}
Some((Unbounded, Excluded(v))) => {
Self::negate_segments(Included(v.clone()), &self.segments[1..])
}
Some((Included(_), Included(_)))
| Some((Included(_), Excluded(_)))
| Some((Excluded(_), Included(_)))
| Some((Excluded(_), Excluded(_))) => Self::negate_segments(Unbounded, &self.segments),
}
}
/// Helper function performing the negation of intervals in segments.
fn negate_segments(start: Bound<V>, segments: &[Interval<V>]) -> Self {
let mut complement_segments: SmallVec<Interval<V>> = SmallVec::empty();
let mut start = start;
for (v1, v2) in segments {
complement_segments.push((
start,
match v1 {
Included(v) => Excluded(v.clone()),
Excluded(v) => Included(v.clone()),
Unbounded => unreachable!(),
},
));
start = match v2 {
Included(v) => Excluded(v.clone()),
Excluded(v) => Included(v.clone()),
Unbounded => Unbounded,
}
}
if !matches!(start, Unbounded) {
complement_segments.push((start, Unbounded));
}
Self {
segments: complement_segments,
}
}
}
impl<V: Ord> Range<V> {
/// If the range includes a single version, return it.
/// Otherwise, returns [None].
pub fn as_singleton(&self) -> Option<&V> {
match self.segments.as_slice() {
[(Included(v1), Included(v2))] => {
if v1 == v2 {
Some(v1)
} else {
None
}
}
_ => None,
}
}
/// Convert to something that can be used with
/// [BTreeMap::range](std::collections::BTreeMap::range).
/// All versions contained in self, will be in the output,
/// but there may be versions in the output that are not contained in self.
/// Returns None if the range is empty.
pub fn bounding_range(&self) -> Option<(Bound<&V>, Bound<&V>)> {
self.segments.first().map(|(start, _)| {
let end = self
.segments
.last()
.expect("if there is a first element, there must be a last element");
(start.as_ref(), end.1.as_ref())
})
}
/// Returns true if this Range contains the specified value.
pub fn contains(&self, version: &V) -> bool {
self.segments
.binary_search_by(|segment| {
// We have to reverse because we need the segment wrt to the version, while
// within bounds tells us the version wrt to the segment.
within_bounds(version, segment).reverse()
})
// An equal interval is one that contains the version
.is_ok()
}
/// Returns true if this Range contains the specified values.
///
/// The `versions` iterator must be sorted.
/// Functionally equivalent to `versions.map(|v| self.contains(v))`.
/// Except it runs in `O(size_of_range + len_of_versions)` not `O(size_of_range * len_of_versions)`
pub fn contains_many<'s, I, BV>(&'s self, versions: I) -> impl Iterator<Item = bool> + 's
where
I: Iterator<Item = BV> + 's,
BV: Borrow<V> + 's,
{
#[cfg(debug_assertions)]
let mut last: Option<BV> = None;
versions.scan(0, move |i, v| {
#[cfg(debug_assertions)]
{
if let Some(l) = last.as_ref() {
assert!(
l.borrow() <= v.borrow(),
"`contains_many` `versions` argument incorrectly sorted"
);
}
}
while let Some(segment) = self.segments.get(*i) {
match within_bounds(v.borrow(), segment) {
Ordering::Less => return Some(false),
Ordering::Equal => return Some(true),
Ordering::Greater => *i += 1,
}
}
#[cfg(debug_assertions)]
{
last = Some(v);
}
Some(false)
})
}
/// Construct a simple range from anything that impls [RangeBounds] like `v1..v2`.
pub fn from_range_bounds<R, IV>(bounds: R) -> Self
where
R: RangeBounds<IV>,
IV: Clone + Into<V>,
{
let start = match bounds.start_bound() {
Included(v) => Included(v.clone().into()),
Excluded(v) => Excluded(v.clone().into()),
Unbounded => Unbounded,
};
let end = match bounds.end_bound() {
Included(v) => Included(v.clone().into()),
Excluded(v) => Excluded(v.clone().into()),
Unbounded => Unbounded,
};
if valid_segment(&start, &end) {
Self {
segments: SmallVec::one((start, end)),
}
} else {
Self::empty()
}
}
fn check_invariants(self) -> Self {
if cfg!(debug_assertions) {
for p in self.segments.as_slice().windows(2) {
assert!(end_before_start_with_gap(&p[0].1, &p[1].0));
}
for (s, e) in self.segments.iter() {
assert!(valid_segment(s, e));
}
}
self
}
}
/// The ordering of the version wrt to the interval.
/// ```text
/// |-------|
/// ^ ^ ^
/// less equal greater
/// ```
fn within_bounds<V: PartialOrd>(version: &V, segment: &Interval<V>) -> Ordering {
let below_lower_bound = match segment {
(Excluded(start), _) => version <= start,
(Included(start), _) => version < start,
(Unbounded, _) => false,
};
if below_lower_bound {
return Ordering::Less;
}
let below_upper_bound = match segment {
(_, Unbounded) => true,
(_, Included(end)) => version <= end,
(_, Excluded(end)) => version < end,
};
if below_upper_bound {
return Ordering::Equal;
}
Ordering::Greater
}
/// A valid segment is one where at least one version fits between start and end
fn valid_segment<T: PartialOrd>(start: &Bound<T>, end: &Bound<T>) -> bool {
match (start, end) {
// Singleton interval are allowed
(Included(s), Included(e)) => s <= e,
(Included(s), Excluded(e)) => s < e,
(Excluded(s), Included(e)) => s < e,
(Excluded(s), Excluded(e)) => s < e,
(Unbounded, _) | (_, Unbounded) => true,
}
}
/// The end of one interval is before the start of the next one, so they can't be concatenated
/// into a single interval. The `union` method calling with both intervals and then the intervals
/// switched. If either is true, the intervals are separate in the union and if both are false, they
/// are merged.
/// ```text
/// True for these two:
/// |----|
/// |-----|
/// ^ end ^ start
/// False for these two:
/// |----|
/// |-----|
/// Here it depends: If they both exclude the position they share, there is a version in between
/// them that blocks concatenation
/// |----|
/// |-----|
/// ```
fn end_before_start_with_gap<V: PartialOrd>(end: &Bound<V>, start: &Bound<V>) -> bool {
match (end, start) {
(_, Unbounded) => false,
(Unbounded, _) => false,
(Included(left), Included(right)) => left < right,
(Included(left), Excluded(right)) => left < right,
(Excluded(left), Included(right)) => left < right,
(Excluded(left), Excluded(right)) => left <= right,
}
}
fn left_start_is_smaller<V: PartialOrd>(left: Bound<V>, right: Bound<V>) -> bool {
match (left, right) {
(Unbounded, _) => true,
(_, Unbounded) => false,
(Included(l), Included(r)) => l <= r,
(Excluded(l), Excluded(r)) => l <= r,
(Included(l), Excluded(r)) => l <= r,
(Excluded(l), Included(r)) => l < r,
}
}
fn left_end_is_smaller<V: PartialOrd>(left: Bound<V>, right: Bound<V>) -> bool {
match (left, right) {
(_, Unbounded) => true,
(Unbounded, _) => false,
(Included(l), Included(r)) => l <= r,
(Excluded(l), Excluded(r)) => l <= r,
(Excluded(l), Included(r)) => l <= r,
(Included(l), Excluded(r)) => l < r,
}
}
/// Group adjacent versions locations.
///
/// ```text
/// [None, 3, 6, 7, None] -> [(3, 7)]
/// [3, 6, 7, None] -> [(None, 7)]
/// [3, 6, 7] -> [(None, None)]
/// [None, 1, 4, 7, None, None, None, 8, None, 9] -> [(1, 7), (8, 8), (9, None)]
/// ```
fn group_adjacent_locations(
mut locations: impl Iterator<Item = Option<usize>>,
) -> impl Iterator<Item = (Option<usize>, Option<usize>)> {
// If the first version matched, then the lower bound of that segment is not needed
let mut seg = locations.next().flatten().map(|ver| (None, Some(ver)));
std::iter::from_fn(move || {
for ver in locations.by_ref() {
if let Some(ver) = ver {
// As long as were still matching versions, we keep merging into the currently matching segment
seg = Some((seg.map_or(Some(ver), |(s, _)| s), Some(ver)));
} else {
// If we have found a version that doesn't match, then right the merge segment and prepare for a new one.
if seg.is_some() {
return seg.take();
}
}
}
// If the last version matched, then write out the merged segment but the upper bound is not needed.
seg.take().map(|(s, _)| (s, None))
})
}
impl<V: Ord + Clone> Range<V> {
/// Computes the union of this `Range` and another.
pub fn union(&self, other: &Self) -> Self {
let mut output: SmallVec<Interval<V>> = SmallVec::empty();
let mut accumulator: Option<(&Bound<_>, &Bound<_>)> = None;
let mut left_iter = self.segments.iter().peekable();
let mut right_iter = other.segments.iter().peekable();
loop {
let smaller_interval = match (left_iter.peek(), right_iter.peek()) {
(Some((left_start, left_end)), Some((right_start, right_end))) => {
if left_start_is_smaller(left_start.as_ref(), right_start.as_ref()) {
left_iter.next();
(left_start, left_end)
} else {
right_iter.next();
(right_start, right_end)
}
}
(Some((left_start, left_end)), None) => {
left_iter.next();
(left_start, left_end)
}
(None, Some((right_start, right_end))) => {
right_iter.next();
(right_start, right_end)
}
(None, None) => break,
};
if let Some(accumulator_) = accumulator {
if end_before_start_with_gap(accumulator_.1, smaller_interval.0) {
output.push((accumulator_.0.clone(), accumulator_.1.clone()));
accumulator = Some(smaller_interval);
} else {
let accumulator_end = match (accumulator_.1, smaller_interval.1) {
(_, Unbounded) | (Unbounded, _) => &Unbounded,
(Included(l), Excluded(r) | Included(r)) if l == r => accumulator_.1,
(Included(l) | Excluded(l), Included(r) | Excluded(r)) => {
if l > r {
accumulator_.1
} else {
smaller_interval.1
}
}
};
accumulator = Some((accumulator_.0, accumulator_end));
}
} else {
accumulator = Some(smaller_interval)
}
}
if let Some(accumulator) = accumulator {
output.push((accumulator.0.clone(), accumulator.1.clone()));
}
Self { segments: output }.check_invariants()
}
/// Computes the intersection of two sets of versions.
pub fn intersection(&self, other: &Self) -> Self {
let mut output: SmallVec<Interval<V>> = SmallVec::empty();
let mut left_iter = self.segments.iter().peekable();
let mut right_iter = other.segments.iter().peekable();
// By the definition of intersection any point that is matched by the output
// must have a segment in each of the inputs that it matches.
// Therefore, every segment in the output must be the intersection of a segment from each of the inputs.
// It would be correct to do the "O(n^2)" thing, by computing the intersection of every segment from one input
// with every segment of the other input, and sorting the result.
// We can avoid the sorting by generating our candidate segments with an increasing `end` value.
while let Some(((left_start, left_end), (right_start, right_end))) =
left_iter.peek().zip(right_iter.peek())
{
// The next smallest `end` value is going to come from one of the inputs.
let left_end_is_smaller = left_end_is_smaller(left_end.as_ref(), right_end.as_ref());
// Now that we are processing `end` we will never have to process any segment smaller than that.
// We can ensure that the input that `end` came from is larger than `end` by advancing it one step.
// `end` is the smaller available input, so we know the other input is already larger than `end`.
// Note: We can call `other_iter.next_if( == end)`, but the ends lining up is rare enough that
// it does not end up being faster in practice.
let (other_start, end) = if left_end_is_smaller {
left_iter.next();
(right_start, left_end)
} else {
right_iter.next();
(left_start, right_end)
};
// `start` will either come from the input `end` came from or the other input, whichever one is larger.
// The intersection is invalid if `start` > `end`.
// But, we already know that the segments in our input are valid.
// So we do not need to check if the `start` from the input `end` came from is smaller then `end`.
// If the `other_start` is larger than end, then the intersection will be invalid.
if !valid_segment(other_start, end) {
// Note: We can call `this_iter.next_if(!valid_segment(other_start, this_end))` in a loop.
// But the checks make it slower for the benchmarked inputs.
continue;
}
let start = match (left_start, right_start) {
(Included(l), Included(r)) => Included(std::cmp::max(l, r)),
(Excluded(l), Excluded(r)) => Excluded(std::cmp::max(l, r)),
(Included(i), Excluded(e)) | (Excluded(e), Included(i)) => {
if i <= e {
Excluded(e)
} else {
Included(i)
}
}
(s, Unbounded) | (Unbounded, s) => s.as_ref(),
};
// Now we clone and push a new segment.
// By dealing with references until now we ensure that NO cloning happens when we reject the segment.
output.push((start.cloned(), end.clone()))
}
Self { segments: output }.check_invariants()
}
/// Return true if there can be no `V` so that `V` is contained in both `self` and `other`.
///
/// Note that we don't know that set of all existing `V`s here, so we only check if the segments
/// are disjoint, not if no version is contained in both.
pub fn is_disjoint(&self, other: &Self) -> bool {
// The operation is symmetric
let mut left_iter = self.segments.iter().peekable();
let mut right_iter = other.segments.iter().peekable();
while let Some((left, right)) = left_iter.peek().zip(right_iter.peek()) {
if !valid_segment(&right.start_bound(), &left.end_bound()) {
left_iter.next();
} else if !valid_segment(&left.start_bound(), &right.end_bound()) {
right_iter.next();
} else {
return false;
}
}
// The remaining element(s) can't intersect anymore
true
}
/// Return true if any `V` that is contained in `self` is also contained in `other`.
///
/// Note that we don't know that set of all existing `V`s here, so we only check if all
/// segments `self` are contained in a segment of `other`.
pub fn subset_of(&self, other: &Self) -> bool {
let mut containing_iter = other.segments.iter();
let mut subset_iter = self.segments.iter();
let Some(mut containing_elem) = containing_iter.next() else {
// As long as we have subset elements, we need containing elements
return subset_iter.next().is_none();
};
for subset_elem in subset_iter {
// Check if the current containing element ends before the subset element.
// There needs to be another containing element for our subset element in this case.
while !valid_segment(&subset_elem.start_bound(), &containing_elem.end_bound()) {
if let Some(containing_elem_) = containing_iter.next() {
containing_elem = containing_elem_;
} else {
return false;
};
}
let start_contained =
left_start_is_smaller(containing_elem.start_bound(), subset_elem.start_bound());
if !start_contained {
// The start element is not contained
return false;
}
let end_contained =
left_end_is_smaller(subset_elem.end_bound(), containing_elem.end_bound());
if !end_contained {
// The end element is not contained
return false;
}
}
true
}
/// Returns a simpler Range that contains the same versions
///
/// For every one of the Versions provided in versions the existing range and
/// the simplified range will agree on whether it is contained.
/// The simplified version may include or exclude versions that are not in versions as the implementation wishes.
/// For example:
/// - If all the versions are contained in the original than the range will be simplified to `full`.
/// - If none of the versions are contained in the original than the range will be simplified to `empty`.
///
/// If versions are not sorted the correctness of this function is not guaranteed.
pub fn simplify<'s, I, BV>(&self, versions: I) -> Self
where
I: Iterator<Item = BV> + 's,
BV: Borrow<V> + 's,
{
#[cfg(debug_assertions)]
let mut last: Option<BV> = None;
// Return the segment index in the range for each version in the range, None otherwise
let version_locations = versions.scan(0, move |i, v| {
#[cfg(debug_assertions)]
{
if let Some(l) = last.as_ref() {
assert!(
l.borrow() <= v.borrow(),
"`simplify` `versions` argument incorrectly sorted"
);
}
}
while let Some(segment) = self.segments.get(*i) {
match within_bounds(v.borrow(), segment) {
Ordering::Less => return Some(None),
Ordering::Equal => return Some(Some(*i)),
Ordering::Greater => *i += 1,
}
}
#[cfg(debug_assertions)]
{
last = Some(v);
}
Some(None)
});
let kept_segments = group_adjacent_locations(version_locations);
self.keep_segments(kept_segments)
}
/// Create a new range with a subset of segments at given location bounds.
///
/// Each new segment is constructed from a pair of segments, taking the
/// start of the first and the end of the second.
fn keep_segments(
&self,
kept_segments: impl Iterator<Item = (Option<usize>, Option<usize>)>,
) -> Range<V> {
let mut segments = SmallVec::Empty;
for (s, e) in kept_segments {
segments.push((
s.map_or(Unbounded, |s| self.segments[s].0.clone()),
e.map_or(Unbounded, |e| self.segments[e].1.clone()),
));
}
Self { segments }.check_invariants()
}
/// Iterate over the parts of the range.
pub fn iter(&self) -> impl Iterator<Item = (&Bound<V>, &Bound<V>)> {
self.segments.iter().map(|(start, end)| (start, end))
}
}
impl<T: Debug + Display + Clone + Eq + Ord> VersionSet for Range<T> {
type V = T;
fn empty() -> Self {
Range::empty()
}
fn singleton(v: Self::V) -> Self {
Range::singleton(v)
}
fn complement(&self) -> Self {
Range::complement(self)
}
fn intersection(&self, other: &Self) -> Self {
Range::intersection(self, other)
}
fn contains(&self, v: &Self::V) -> bool {
Range::contains(self, v)
}
fn full() -> Self {
Range::full()
}
fn union(&self, other: &Self) -> Self {
Range::union(self, other)
}
fn is_disjoint(&self, other: &Self) -> bool {
Range::is_disjoint(self, other)
}
fn subset_of(&self, other: &Self) -> bool {
Range::subset_of(self, other)
}
}
// REPORT ######################################################################
impl<V: Display + Eq> Display for Range<V> {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
if self.segments.is_empty() {
write!(f, "∅")?;
} else {
for (idx, segment) in self.segments.iter().enumerate() {
if idx > 0 {
write!(f, " | ")?;
}
match segment {
(Unbounded, Unbounded) => write!(f, "*")?,
(Unbounded, Included(v)) => write!(f, "<={v}")?,
(Unbounded, Excluded(v)) => write!(f, "<{v}")?,
(Included(v), Unbounded) => write!(f, ">={v}")?,
(Included(v), Included(b)) => {
if v == b {
write!(f, "{v}")?
} else {
write!(f, ">={v}, <={b}")?
}
}
(Included(v), Excluded(b)) => write!(f, ">={v}, <{b}")?,
(Excluded(v), Unbounded) => write!(f, ">{v}")?,
(Excluded(v), Included(b)) => write!(f, ">{v}, <={b}")?,
(Excluded(v), Excluded(b)) => write!(f, ">{v}, <{b}")?,
};
}
}
Ok(())
}
}
// SERIALIZATION ###############################################################
#[cfg(feature = "serde")]
impl<'de, V: serde::Deserialize<'de>> serde::Deserialize<'de> for Range<V> {
fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
// This enables conversion from the "old" discrete implementation of `Range` to the new
// bounded one.
//
// Serialization is always performed in the new format.
#[derive(serde::Deserialize)]
#[serde(untagged)]
enum EitherInterval<V> {
B(Bound<V>, Bound<V>),
D(V, Option<V>),
}
let bounds: SmallVec<EitherInterval<V>> = serde::Deserialize::deserialize(deserializer)?;
let mut segments = SmallVec::Empty;
for i in bounds {
match i {
EitherInterval::B(l, r) => segments.push((l, r)),
EitherInterval::D(l, Some(r)) => segments.push((Included(l), Excluded(r))),
EitherInterval::D(l, None) => segments.push((Included(l), Unbounded)),
}
}
Ok(Range { segments })
}
}
// TESTS #######################################################################
#[cfg(test)]
pub mod tests {
use proptest::prelude::*;
use super::*;
/// Generate version sets from a random vector of deltas between bounds.
/// Each bound is randomly inclusive or exclusive.
pub fn strategy() -> impl Strategy<Value = Range<u32>> {
(
any::<bool>(),
prop::collection::vec(any::<(u32, bool)>(), 1..10),
)
.prop_map(|(start_unbounded, deltas)| {
let mut start = if start_unbounded {
Some(Unbounded)
} else {
None
};
let mut largest: u32 = 0;
let mut last_bound_was_inclusive = false;
let mut segments = SmallVec::Empty;
for (delta, inclusive) in deltas {
// Add the offset to the current bound
largest = match largest.checked_add(delta) {
Some(s) => s,
None => {
// Skip this offset, if it would result in a too large bound.
continue;
}
};
let current_bound = if inclusive {
Included(largest)
} else {
Excluded(largest)
};
// If we already have a start bound, the next offset defines the complete range.
// If we don't have a start bound, we have to generate one.
if let Some(start_bound) = start.take() {
// If the delta from the start bound is 0, the only authorized configuration is
// Included(x), Included(x)
if delta == 0 && !(matches!(start_bound, Included(_)) && inclusive) {
start = Some(start_bound);
continue;
}
last_bound_was_inclusive = inclusive;
segments.push((start_bound, current_bound));
} else {
// If the delta from the end bound of the last range is 0 and
// any of the last ending or current starting bound is inclusive,
// we skip the delta because they basically overlap.
if delta == 0 && (last_bound_was_inclusive || inclusive) {
continue;
}
start = Some(current_bound);
}
}
// If we still have a start bound, but didn't have enough deltas to complete another
// segment, we add an unbounded upperbound.
if let Some(start_bound) = start {
segments.push((start_bound, Unbounded));
}
Range { segments }.check_invariants()
})
}
fn version_strat() -> impl Strategy<Value = u32> {
any::<u32>()
}
proptest! {
// Testing negate ----------------------------------
#[test]
fn negate_is_different(range in strategy()) {
assert_ne!(range.complement(), range);
}
#[test]
fn double_negate_is_identity(range in strategy()) {
assert_eq!(range.complement().complement(), range);
}
#[test]
fn negate_contains_opposite(range in strategy(), version in version_strat()) {
assert_ne!(range.contains(&version), range.complement().contains(&version));
}
// Testing intersection ----------------------------
#[test]
fn intersection_is_symmetric(r1 in strategy(), r2 in strategy()) {
assert_eq!(r1.intersection(&r2), r2.intersection(&r1));
}
#[test]
fn intersection_with_any_is_identity(range in strategy()) {
assert_eq!(Range::full().intersection(&range), range);
}
#[test]
fn intersection_with_none_is_none(range in strategy()) {
assert_eq!(Range::empty().intersection(&range), Range::empty());
}
#[test]
fn intersection_is_idempotent(r1 in strategy(), r2 in strategy()) {
assert_eq!(r1.intersection(&r2).intersection(&r2), r1.intersection(&r2));
}
#[test]
fn intersection_is_associative(r1 in strategy(), r2 in strategy(), r3 in strategy()) {
assert_eq!(r1.intersection(&r2).intersection(&r3), r1.intersection(&r2.intersection(&r3)));
}
#[test]
fn intesection_of_complements_is_none(range in strategy()) {
assert_eq!(range.complement().intersection(&range), Range::empty());
}
#[test]
fn intesection_contains_both(r1 in strategy(), r2 in strategy(), version in version_strat()) {
assert_eq!(r1.intersection(&r2).contains(&version), r1.contains(&version) && r2.contains(&version));
}
// Testing union -----------------------------------
#[test]
fn union_of_complements_is_any(range in strategy()) {
assert_eq!(range.complement().union(&range), Range::full());
}
#[test]
fn union_contains_either(r1 in strategy(), r2 in strategy(), version in version_strat()) {
assert_eq!(r1.union(&r2).contains(&version), r1.contains(&version) || r2.contains(&version));
}
#[test]
fn is_disjoint_through_intersection(r1 in strategy(), r2 in strategy()) {
let disjoint_def = r1.intersection(&r2) == Range::empty();
assert_eq!(r1.is_disjoint(&r2), disjoint_def);
}
#[test]
fn subset_of_through_intersection(r1 in strategy(), r2 in strategy()) {
let disjoint_def = r1.intersection(&r2) == r1;
assert_eq!(r1.subset_of(&r2), disjoint_def);
}
#[test]
fn union_through_intersection(r1 in strategy(), r2 in strategy()) {
let union_def = r1
.complement()
.intersection(&r2.complement())
.complement()
.check_invariants();
assert_eq!(r1.union(&r2), union_def);
}
// Testing contains --------------------------------
#[test]
fn always_contains_exact(version in version_strat()) {
assert!(Range::singleton(version).contains(&version));
}
#[test]
fn contains_negation(range in strategy(), version in version_strat()) {
assert_ne!(range.contains(&version), range.complement().contains(&version));
}
#[test]
fn contains_intersection(range in strategy(), version in version_strat()) {
assert_eq!(range.contains(&version), range.intersection(&Range::singleton(version)) != Range::empty());
}
#[test]
fn contains_bounding_range(range in strategy(), version in version_strat()) {
if range.contains(&version) {
assert!(range.bounding_range().map(|b| b.contains(&version)).unwrap_or(false));
}
}
#[test]
fn from_range_bounds(range in any::<(Bound<u32>, Bound<u32>)>(), version in version_strat()) {
let rv: Range<_> = Range::from_range_bounds(range);
assert_eq!(range.contains(&version), rv.contains(&version));
}
#[test]
fn from_range_bounds_round_trip(range in any::<(Bound<u32>, Bound<u32>)>()) {
let rv: Range<u32> = Range::from_range_bounds(range);
let rv2: Range<u32> = rv.bounding_range().map(Range::from_range_bounds::<_, u32>).unwrap_or_else(Range::empty);
assert_eq!(rv, rv2);
}
#[test]
fn contains(range in strategy(), versions in proptest::collection::vec(version_strat(), ..30)) {
for v in versions {
assert_eq!(range.contains(&v), range.segments.iter().any(|s| RangeBounds::contains(s, &v)));
}
}
#[test]
fn contains_many(range in strategy(), mut versions in proptest::collection::vec(version_strat(), ..30)) {
versions.sort();
assert_eq!(versions.len(), range.contains_many(versions.iter()).count());
for (a, b) in versions.iter().zip(range.contains_many(versions.iter())) {
assert_eq!(range.contains(a), b);
}
}
#[test]
fn simplify(range in strategy(), mut versions in proptest::collection::vec(version_strat(), ..30)) {
versions.sort();
let simp = range.simplify(versions.iter());
for v in versions {
assert_eq!(range.contains(&v), simp.contains(&v));
}
assert!(simp.segments.len() <= range.segments.len())
}
}
#[test]
fn contains_many_can_take_owned() {
let range: Range<u8> = Range::singleton(1);
let versions = vec![1, 2, 3];
// Check that iter can be a Cow
assert_eq!(
range.contains_many(versions.iter()).count(),
range
.contains_many(versions.iter().map(std::borrow::Cow::Borrowed))
.count()
);
// Check that iter can be a V
assert_eq!(
range.contains_many(versions.iter()).count(),
range.contains_many(versions.into_iter()).count()
);
}
#[test]
fn simplify_can_take_owned() {
let range: Range<u8> = Range::singleton(1);
let versions = vec![1, 2, 3];
// Check that iter can be a Cow
assert_eq!(
range.simplify(versions.iter()),
range.simplify(versions.iter().map(std::borrow::Cow::Borrowed))
);
// Check that iter can be a V
assert_eq!(
range.simplify(versions.iter()),
range.simplify(versions.into_iter())
);
}
}