Simplify method return value

crates/fj-kernel/src/partial/maybe_partial.rs

@@ -141,12 +141,12 @@ impl MaybePartial<HalfEdge> {
     }
 
     /// Access the vertices
-    pub fn vertices(&self) -> [Option<MaybePartial<Vertex>>; 2] {
+    pub fn vertices(&self) -> [MaybePartial<Vertex>; 2] {
         match self {
             Self::Full(full) => {
-                full.vertices().clone().map(|vertex| Some(vertex.into()))
+                full.vertices().clone().map(|vertex| vertex.into())
             }
-            Self::Partial(partial) => partial.vertices.clone().map(Some),
+            Self::Partial(partial) => partial.vertices.clone(),
         }
     }
 }

crates/fj-kernel/src/partial/objects/cycle.rs

@@ -49,9 +49,7 @@ impl PartialCycle {
             .half_edges
             .last()
             .map(|half_edge| {
-                let [_, last] = half_edge.vertices().map(|vertex| {
-                    vertex.expect("Need half-edge vertices to extend cycle")
-                });
+                let [_, last] = half_edge.vertices();
                 last.surface_form()
             })
             .into_iter()
@@ -129,13 +127,8 @@ impl PartialCycle {
         let first = self.half_edges.first();
         let last = self.half_edges.last();
 
-        let vertices = [first, last].map(|option| {
-            option.map(|half_edge| {
-                half_edge
-                    .vertices()
-                    .map(|vertex| vertex.expect("Need vertices to close cycle"))
-            })
-        });
+        let vertices = [first, last]
+            .map(|option| option.map(|half_edge| half_edge.vertices()));
 
         if let [Some([first, _]), Some([_, last])] = vertices {
             let vertices = [last, first].map(|vertex| {