fmt, lint

georust · Aug 13, 2022 · a1bdc10 · a1bdc10
1 parent 0265f40
commit a1bdc10
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/geo/src/algorithm/bool_ops/mod.rs b/geo/src/algorithm/bool_ops/mod.rs
@@ -43,7 +43,11 @@ pub trait BooleanOps: Sized {
     ///
     /// Returns the set-theoeretic intersection of `self` and `ls` if `invert`
     /// is false, and the difference (`ls - self`) otherwise.
-    fn clip(&self, ls: &MultiLineString<Self::Scalar>, invert: bool) -> MultiLineString<Self::Scalar>;
+    fn clip(
+        &self,
+        ls: &MultiLineString<Self::Scalar>,
+        invert: bool,
+    ) -> MultiLineString<Self::Scalar>;
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
@@ -65,7 +69,11 @@ impl<T: GeoFloat> BooleanOps for Polygon<T> {
         bop.sweep()
     }
 
-    fn clip(&self, ls: &MultiLineString<Self::Scalar>, invert: bool) -> MultiLineString<Self::Scalar> {
+    fn clip(
+        &self,
+        ls: &MultiLineString<Self::Scalar>,
+        invert: bool,
+    ) -> MultiLineString<Self::Scalar> {
         let spec = ClipOp::new(invert);
         let mut bop = Proc::new(spec, self.coords_count() + ls.coords_count());
         bop.add_polygon(self, 0);
@@ -86,7 +94,11 @@ impl<T: GeoFloat> BooleanOps for MultiPolygon<T> {
         bop.sweep()
     }
 
-    fn clip(&self, ls: &MultiLineString<Self::Scalar>, invert: bool) -> MultiLineString<Self::Scalar> {
+    fn clip(
+        &self,
+        ls: &MultiLineString<Self::Scalar>,
+        invert: bool,
+    ) -> MultiLineString<Self::Scalar> {
         let spec = ClipOp::new(invert);
         let mut bop = Proc::new(spec, self.coords_count() + ls.coords_count());
         bop.add_multi_polygon(self, 0);

diff --git a/geo/src/algorithm/bool_ops/spec.rs b/geo/src/algorithm/bool_ops/spec.rs
@@ -86,7 +86,7 @@ impl<T: GeoFloat> Spec<T> for ClipOp<T> {
     }
 
     fn output(&mut self, regions: [Self::Region; 2], geom: LineOrPoint<T>, idx: usize) {
-        if idx > 0 && (regions[0].is_first && regions[1].is_first) == !self.invert {
+        if idx > 0 && (regions[0].is_first && regions[1].is_first) != self.invert {
             self.assembly.add_edge(geom, idx);
         }
     }