From 333c3acb192039548a208e1a35b43f627a475c19 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Thu, 28 May 2020 18:33:05 -0700 Subject: [PATCH] Reduce duplication --- quinn-proto/src/range_set.rs | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/quinn-proto/src/range_set.rs b/quinn-proto/src/range_set.rs index 7c09d9dbb..f193c104a 100644 --- a/quinn-proto/src/range_set.rs +++ b/quinn-proto/src/range_set.rs @@ -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); }