From 386c10524c2389ead7f4fa08c3b60c179362a8ee Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Tue, 8 Mar 2022 17:15:08 +0100 Subject: [PATCH] Remove redundant block --- src/kernel/shapes/difference_2d.rs | 59 ++++++++++++++---------------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/src/kernel/shapes/difference_2d.rs b/src/kernel/shapes/difference_2d.rs index 61113f8d7..c6ea0cd69 100644 --- a/src/kernel/shapes/difference_2d.rs +++ b/src/kernel/shapes/difference_2d.rs @@ -48,41 +48,38 @@ impl ToShape for fj::Difference2d { }); } - { - // Can't panic, as we just verified that both shapes have one face. - let [face_a, face_b] = [&mut a, &mut b] - .map(|shape| shape.faces().all().next().unwrap()); + // Can't panic, as we just verified that both shapes have one face. + let [face_a, face_b] = + [&mut a, &mut b].map(|shape| shape.faces().all().next().unwrap()); - let (cycles_a, cycles_b, surface_a, surface_b) = - match ((*face_a).clone(), (*face_b).clone()) { - ( - Face::Face { - cycles: a, - surface: surface_a, - }, - Face::Face { - cycles: b, - surface: surface_b, - }, - ) => (a, b, surface_a, surface_b), - _ => { - // None of the 2D types still use triangle - // representation. - unreachable!() - } - }; + let (cycles_a, cycles_b, surface_a, surface_b) = + match ((*face_a).clone(), (*face_b).clone()) { + ( + Face::Face { + cycles: a, + surface: surface_a, + }, + Face::Face { + cycles: b, + surface: surface_b, + }, + ) => (a, b, surface_a, surface_b), + _ => { + // None of the 2D types still use triangle representation. + unreachable!() + } + }; - assert!( - surface_a == surface_b, - "Trying to subtract sketches with different surfaces." - ); - let surface = surface_a; + assert!( + surface_a == surface_b, + "Trying to subtract sketches with different surfaces." + ); + let surface = surface_a; - let mut cycles = cycles_a; - cycles.extend(cycles_b); + let mut cycles = cycles_a; + cycles.extend(cycles_b); - shape.faces().add(Face::Face { cycles, surface }); - }; + shape.faces().add(Face::Face { cycles, surface }); shape }