From 5fb76e8a02f78e6e613fbf564b07008d4743c3d2 Mon Sep 17 00:00:00 2001
From: Hanno Braun <hanno@braun-odw.eu>
Date: Fri, 11 Aug 2023 12:51:27 +0200
Subject: [PATCH] Simplify `CurveBoundary::normalize`

The additional `bool` return value was confusing and easy to misuse.
Callers that need this information can use `is_normalized`, which should
result in clearer (if a bit more verbose) code.
---
 crates/fj-core/src/geometry/boundary.rs | 6 +++---
 crates/fj-core/src/validate/shell.rs    | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/crates/fj-core/src/geometry/boundary.rs b/crates/fj-core/src/geometry/boundary.rs
index 42542a6b8..26040bbd8 100644
--- a/crates/fj-core/src/geometry/boundary.rs
+++ b/crates/fj-core/src/geometry/boundary.rs
@@ -45,11 +45,11 @@ impl<T: CurveBoundaryElement> CurveBoundary<T> {
     ///
     /// This can be used to compare a boundary while disregarding its direction.
     #[must_use]
-    pub fn normalize(self) -> (Self, bool) {
+    pub fn normalize(self) -> Self {
         if self.is_normalized() {
-            (self, false)
+            self
         } else {
-            (self.reverse(), true)
+            self.reverse()
         }
     }
 }
diff --git a/crates/fj-core/src/validate/shell.rs b/crates/fj-core/src/validate/shell.rs
index c87b92542..eb1f1f328 100644
--- a/crates/fj-core/src/validate/shell.rs
+++ b/crates/fj-core/src/validate/shell.rs
@@ -235,7 +235,6 @@ impl ShellValidationError {
                                 .bounding_vertices_of_edge(edge)
                                 .expect("Expected edge to be part of shell")
                                 .normalize()
-                                .0
                         };
 
                         bounding_vertices_of(edge_a)
@@ -315,8 +314,7 @@ impl ShellValidationError {
                         .expect(
                             "Cycle should provide bounds of its own half-edge",
                         )
-                        .normalize()
-                        .0;
+                        .normalize();
 
                     let edge = (curve, bounding_vertices);
 
@@ -396,8 +394,7 @@ impl ShellValidationError {
                         .expect(
                             "Just got edge from this cycle; must be part of it",
                         )
-                        .normalize()
-                        .0;
+                        .normalize();
 
                     edges_by_coincidence
                         .entry((curve, boundary))