From c90b628b90e1426f1e018bbe3ef8848b6b33a719 Mon Sep 17 00:00:00 2001
From: Hanno Braun <hanno@braun-odw.eu>
Date: Tue, 17 May 2022 17:46:31 +0200
Subject: [PATCH 1/2] Simplify import

---
 crates/fj-kernel/src/topology/edges.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/fj-kernel/src/topology/edges.rs b/crates/fj-kernel/src/topology/edges.rs
index 73f590b66..1b588e5d0 100644
--- a/crates/fj-kernel/src/topology/edges.rs
+++ b/crates/fj-kernel/src/topology/edges.rs
@@ -3,7 +3,7 @@ use crate::{
     shape::{Handle, LocalForm, Shape},
 };
 
-use super::{vertices::Vertex, EdgeBuilder};
+use super::{EdgeBuilder, Vertex};
 
 /// An edge of a shape
 ///

From 85a75ffe9754e7c89a11f18ad9b27bde0e4b4daf Mon Sep 17 00:00:00 2001
From: Hanno Braun <hanno@braun-odw.eu>
Date: Tue, 17 May 2022 17:43:18 +0200
Subject: [PATCH 2/2] Simplify names of `topology` modules

All of them contain one primary type now. I think it makes most sense to
just name them after that respective type directly.
---
 .../src/topology/{cycles.rs => cycle.rs}         |  0
 .../fj-kernel/src/topology/{edges.rs => edge.rs} |  0
 .../fj-kernel/src/topology/{faces.rs => face.rs} |  0
 crates/fj-kernel/src/topology/mod.rs             | 16 ++++++++--------
 .../src/topology/{vertices.rs => vertex.rs}      |  0
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename crates/fj-kernel/src/topology/{cycles.rs => cycle.rs} (100%)
 rename crates/fj-kernel/src/topology/{edges.rs => edge.rs} (100%)
 rename crates/fj-kernel/src/topology/{faces.rs => face.rs} (100%)
 rename crates/fj-kernel/src/topology/{vertices.rs => vertex.rs} (100%)

diff --git a/crates/fj-kernel/src/topology/cycles.rs b/crates/fj-kernel/src/topology/cycle.rs
similarity index 100%
rename from crates/fj-kernel/src/topology/cycles.rs
rename to crates/fj-kernel/src/topology/cycle.rs
diff --git a/crates/fj-kernel/src/topology/edges.rs b/crates/fj-kernel/src/topology/edge.rs
similarity index 100%
rename from crates/fj-kernel/src/topology/edges.rs
rename to crates/fj-kernel/src/topology/edge.rs
diff --git a/crates/fj-kernel/src/topology/faces.rs b/crates/fj-kernel/src/topology/face.rs
similarity index 100%
rename from crates/fj-kernel/src/topology/faces.rs
rename to crates/fj-kernel/src/topology/face.rs
diff --git a/crates/fj-kernel/src/topology/mod.rs b/crates/fj-kernel/src/topology/mod.rs
index dbfc15c39..2e45cae62 100644
--- a/crates/fj-kernel/src/topology/mod.rs
+++ b/crates/fj-kernel/src/topology/mod.rs
@@ -17,15 +17,15 @@
 //! refer to objects in the same memory location.
 
 mod builder;
-mod cycles;
-mod edges;
-mod faces;
-mod vertices;
+mod cycle;
+mod edge;
+mod face;
+mod vertex;
 
 pub use self::{
     builder::{CycleBuilder, EdgeBuilder, FaceBuilder, VertexBuilder},
-    cycles::Cycle,
-    edges::Edge,
-    faces::{CyclesInFace, Face},
-    vertices::Vertex,
+    cycle::Cycle,
+    edge::Edge,
+    face::{CyclesInFace, Face},
+    vertex::Vertex,
 };
diff --git a/crates/fj-kernel/src/topology/vertices.rs b/crates/fj-kernel/src/topology/vertex.rs
similarity index 100%
rename from crates/fj-kernel/src/topology/vertices.rs
rename to crates/fj-kernel/src/topology/vertex.rs