Reduce duplication

This commit is contained in:
Benjamin Saunders
2020-05-28 18:33:05 -07:00
committed by Dirkjan Ochtman
parent de44b35393
commit 333c3acb19
+3 -12
View File
@@ -64,25 +64,16 @@ impl RangeSet {
// Wholly contained
return false;
} else if end >= x.start {
// Overlaps with pred
// Extend overlapping predecessor
self.0.remove(&start);
while let Some((next_start, next_end)) = self.succ(x.start) {
if next_start > x.end {
break;
}
// ..and succ
self.0.remove(&next_start);
x.end = cmp::max(next_end, x.end);
}
self.0.insert(start, x.end);
return true;
x.start = start;
}
}
while let Some((next_start, next_end)) = self.succ(x.start) {
if next_start > x.end {
break;
}
// Overlaps with succ
// Overlaps with successor
self.0.remove(&next_start);
x.end = cmp::max(next_end, x.end);
}