From eca162a53fae33dd1c2e219f93b2157122159ea8 Mon Sep 17 00:00:00 2001 From: ripytide Date: Tue, 2 Jan 2024 23:49:39 +0000 Subject: [PATCH] cargo fmt --- src/interval.rs | 2 +- src/map.rs | 84 +++++++++++++++++++++++-------------------------- src/set.rs | 10 ++++-- src/utils.rs | 2 +- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/interval.rs b/src/interval.rs index 7cc303c..a7c826a 100644 --- a/src/interval.rs +++ b/src/interval.rs @@ -155,7 +155,7 @@ where /// /// ``` /// use nodit::interval::uu; -/// use nodit::{Interval, InclusiveInterval}; +/// use nodit::{InclusiveInterval, Interval}; /// /// let interval1: Interval = uu(); /// let interval2: Interval = uu(); diff --git a/src/map.rs b/src/map.rs index 5facce1..50a40c2 100644 --- a/src/map.rs +++ b/src/map.rs @@ -274,8 +274,7 @@ where /// use nodit::interval::ie; /// use nodit::NoditMap; /// let mut map = - /// NoditMap::from_slice_strict([(ie(1, 4), false)]) - /// .unwrap(); + /// NoditMap::from_slice_strict([(ie(1, 4), false)]).unwrap(); /// /// if let Some(x) = map.get_at_point_mut(2) { /// *x = true; @@ -503,7 +502,10 @@ where let returning_before_cut = cut_result.before_cut.map(K::from); let returning_after_cut = cut_result.after_cut.map(K::from); - let value = self.inner.remove(overlapping_comp(interval.start())).unwrap(); + let value = self + .inner + .remove(overlapping_comp(interval.start())) + .unwrap(); if let Some(before) = returning_before_cut { self.insert_unchecked(before, value.clone()); @@ -549,7 +551,8 @@ where None => (None, None), }; - let before_value = self.inner.remove(overlapping_comp(interval.start())); + let before_value = + self.inner.remove(overlapping_comp(interval.start())); let after_value = self.inner.remove(overlapping_comp(interval.end())); if let Some(returning_before_cut) = returning_before_cut { @@ -630,8 +633,9 @@ where let start_gap = (!self.inner.contains_key(overlapping_comp(interval.start()))) .then(|| self.get_gap_at_raw(interval.start())); - let end_gap = (!self.inner.contains_key(overlapping_comp(interval.end()))) - .then(|| self.get_gap_at_raw(interval.end())); + let end_gap = + (!self.inner.contains_key(overlapping_comp(interval.end()))) + .then(|| self.get_gap_at_raw(interval.end())); let (start_gap, end_gap) = match (start_gap, end_gap) { (Some(start_gap), Some(end_gap)) => { @@ -717,8 +721,9 @@ where let start_gap = (!self.inner.contains_key(overlapping_comp(interval.start()))) .then(|| self.get_gap_at_raw(interval.start())); - let end_gap = (!self.inner.contains_key(overlapping_comp(interval.end()))) - .then(|| self.get_gap_at_raw(interval.end())); + let end_gap = + (!self.inner.contains_key(overlapping_comp(interval.end()))) + .then(|| self.get_gap_at_raw(interval.end())); let (trimmed_start_gap, trimmed_end_gap) = match (start_gap, end_gap) { (Some(mut start_gap), Some(mut end_gap)) => { @@ -870,12 +875,10 @@ where let matching_end = get_end(self, &value); let returning = match (matching_start, matching_end) { - (Some(matching_start), Some(matching_end)) => { - K::from(Interval { - start: matching_start.start(), - end: matching_end.end(), - }) - } + (Some(matching_start), Some(matching_end)) => K::from(Interval { + start: matching_start.start(), + end: matching_end.end(), + }), (Some(matching_start), None) => K::from(Interval { start: matching_start.start(), end: interval.end(), @@ -1275,8 +1278,7 @@ where /// use nodit::NoditMap; /// /// let mut map = - /// NoditMap::from_slice_strict([(ie(2, 8), false)]) - /// .unwrap(); + /// NoditMap::from_slice_strict([(ie(2, 8), false)]).unwrap(); /// /// map.insert_overwrite(ie(4, 6), true); /// @@ -1355,11 +1357,12 @@ where /// let slice = /// [(ie(1, 4), false), (ie(4, 8), true), (ie(8, 100), false)]; /// - /// let map: NoditMap<_, _, _> = - /// NoditMap::from_iter_strict( - /// slice.into_iter().filter(|(interval, _)| interval.start() > 2), - /// ) - /// .unwrap(); + /// let map: NoditMap<_, _, _> = NoditMap::from_iter_strict( + /// slice + /// .into_iter() + /// .filter(|(interval, _)| interval.start() > 2), + /// ) + /// .unwrap(); /// ``` pub fn from_iter_strict( iter: impl Iterator, @@ -1377,10 +1380,9 @@ impl NoditMap { /// /// # Examples /// ``` - /// use nodit::{NoditMap, Interval}; + /// use nodit::{Interval, NoditMap}; /// - /// let map: NoditMap, bool> = - /// NoditMap::new(); + /// let map: NoditMap, bool> = NoditMap::new(); /// ``` pub fn new() -> Self { NoditMap { @@ -1541,7 +1543,9 @@ where I: PointType, K: IntervalType, { - |inner_interval: &K, new_interval: &K| new_interval.start().cmp(&inner_interval.start()) + |inner_interval: &K, new_interval: &K| { + new_interval.start().cmp(&inner_interval.start()) + } } fn overlapping_comp(point: I) -> impl FnMut(&K) -> Ordering where @@ -2036,13 +2040,10 @@ mod tests { [ei(4, 5), ee(7, 14), ii(16, i8::MAX)], ); assert_eq!( - NoditMap::from_slice_strict([( - ii(i8::MIN, i8::MAX), - false - )]) - .unwrap() - .gaps_trimmed(uu()) - .collect::>(), + NoditMap::from_slice_strict([(ii(i8::MIN, i8::MAX), false)]) + .unwrap() + .gaps_trimmed(uu()) + .collect::>(), [] ); } @@ -2077,13 +2078,10 @@ mod tests { [ei(4, 5), ee(7, 14), ii(16, i8::MAX)], ); assert_eq!( - NoditMap::from_slice_strict([( - ii(i8::MIN, i8::MAX), - false - )]) - .unwrap() - .gaps_trimmed(uu()) - .collect::>(), + NoditMap::from_slice_strict([(ii(i8::MIN, i8::MAX), false)]) + .unwrap() + .gaps_trimmed(uu()) + .collect::>(), [] ); } @@ -2372,7 +2370,8 @@ mod tests { let mathematical_definition_of_overlap = NUMBERS_DOMAIN.iter().any(|x| { - contains_point(interval1, *x) && contains_point(interval2, *x) + contains_point(interval1, *x) + && contains_point(interval2, *x) }); if our_answer != mathematical_definition_of_overlap { @@ -2477,10 +2476,7 @@ mod tests { input.intersect(&Interval { start: 10, end: 13 }), Some(Interval { start: 10, end: 10 }) ); - assert_eq!( - input.intersect(&Interval { start: 11, end: 13 }), - None - ); + assert_eq!(input.intersect(&Interval { start: 11, end: 13 }), None); } #[test] diff --git a/src/set.rs b/src/set.rs index 139f83a..d206246 100644 --- a/src/set.rs +++ b/src/set.rs @@ -32,7 +32,7 @@ use serde::ser::SerializeSeq; use serde::{Deserialize, Deserializer, Serialize, Serializer}; use crate::map::IntoIter as NoditMapIntoIter; -use crate::{NoditMap, OverlapError, PointType, IntervalType}; +use crate::{IntervalType, NoditMap, OverlapError, PointType}; /// An ordered set of non-overlapping intervals based on [`NoditMap`]. /// @@ -125,7 +125,10 @@ where self.inner.contains_entire_interval(interval) } /// See [`NoditMap::insert_strict()`] for more details. - pub fn insert_strict(&mut self, interval: K) -> Result<(), OverlapError<()>> { + pub fn insert_strict( + &mut self, + interval: K, + ) -> Result<(), OverlapError<()>> { self.inner.insert_strict(interval, ()) } /// See [`NoditMap::insert_merge_touching()`] for more details. @@ -141,7 +144,8 @@ where } /// See [`NoditMap::insert_merge_touching_or_overlapping()`] for more details. pub fn insert_merge_touching_or_overlapping(&mut self, interval: K) -> K { - self.inner.insert_merge_touching_or_overlapping(interval, ()) + self.inner + .insert_merge_touching_or_overlapping(interval, ()) } /// See [`NoditMap::insert_overwrite()`] for more details. pub fn insert_overwrite(&mut self, interval: K) -> impl Iterator { diff --git a/src/utils.rs b/src/utils.rs index 9652e25..e782184 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -19,7 +19,7 @@ along with nodit. If not, see . use core::cmp::Ordering; -use crate::{Interval, InclusiveInterval, PointType, IntervalType}; +use crate::{InclusiveInterval, Interval, IntervalType, PointType}; pub(crate) fn cmp_point_with_interval(point: I, interval: K) -> Ordering where