yggdrasil/discrete_range_map
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change cut to K's too

Browse Source
This commit is contained in:
ripytide 2023-04-22 10:50:33 +01:00
parent acdca65d27
commit d764b0a7f4
No known key found for this signature in database
GPG Key ID: B2629F9EC7C2FE8C
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/discrete_range_map.rs
View File

@ -573,7 +573,7 @@ where
pub fn cut<'a, Q>(
&'a mut self,
range: Q,
) -> impl Iterator<Item = (DiscreteFiniteBounds<I>, V)> + '_
) -> impl Iterator<Item = (K, V)> + '_
where
Q: FiniteRange<I> + Copy + 'a,
V: Clone,
@ -604,7 +604,7 @@ where
&mut self,
range: Q,
single_overlapping_range: K,
) -> impl Iterator<Item = (DiscreteFiniteBounds<I>, V)>
) -> impl Iterator<Item = (K, V)>
where
Q: FiniteRange<I> + Copy,
V: Clone,
@ -625,14 +625,14 @@ where
self.insert_unchecked(after, value.clone());
}
once((cut_result.inside_cut.unwrap(), value))
once((cut_result.inside_cut.map(K::from).unwrap(), value))
}
fn cut_non_single_overlapping<'a, Q>(
&'a mut self,
range: Q,
left_overlapping: Option<K>,
right_overlapping: Option<K>,
) -> impl Iterator<Item = (DiscreteFiniteBounds<I>, V)> + '_
) -> impl Iterator<Item = (K, V)> + '_
where
Q: FiniteRange<I> + Copy + 'a,
V: Clone,
@ -643,7 +643,7 @@ where
Some(before) => {
let cut_result = cut_range(before, range);
(cut_result.before_cut.map(K::from), cut_result.inside_cut)
(cut_result.before_cut.map(K::from), cut_result.inside_cut.map(K::from))
}
None => (None, None),
};
@ -651,7 +651,7 @@ where
Some(after) => {
let cut_result = cut_range(after, range);
(cut_result.after_cut.map(K::from), cut_result.inside_cut)
(cut_result.after_cut.map(K::from), cut_result.inside_cut.map(K::from))
}
None => (None, None),
};
@ -681,10 +681,10 @@ where
.into_iter()
.chain(self.remove_overlapping(range).map(|(key, value)| {
(
DiscreteFiniteBounds {
K::from(DiscreteFiniteBounds {
start: key.start(),
end: key.end(),
},
}),
value,
)
}))

5
src/discrete_range_set.rs
View File

@ -87,10 +87,7 @@ where
self.inner.remove_overlapping(range).map(first)
}
/// See [`DiscreteRangeMap::cut()`] for more details.
pub fn cut<'a, Q>(
&'a mut self,
range: Q,
) -> impl Iterator<Item = DiscreteFiniteBounds<I>> + '_
pub fn cut<'a, Q>(&'a mut self, range: Q) -> impl Iterator<Item = K> + '_
where
Q: FiniteRange<I> + Copy + 'a,
{