From 2d5de212d289547a170457579f1bdadf481e9ffa Mon Sep 17 00:00:00 2001 From: Mikolaj Wielgus Date: Wed, 17 Jan 2024 11:09:31 +0000 Subject: [PATCH] primitive: slightly reduce code duplication by calling `.adjacents()` --- src/primitive.rs | 40 ++++------------------------------------ 1 file changed, 4 insertions(+), 36 deletions(-) diff --git a/src/primitive.rs b/src/primitive.rs index 8a4a250..649501c 100644 --- a/src/primitive.rs +++ b/src/primitive.rs @@ -305,24 +305,8 @@ impl_loose_primitive!(LooseDot, LooseDotWeight); impl<'a> LooseDot<'a> { pub fn seg(&self) -> Option { - self.layout - .geometry() - .neighbors_undirected(self.index.node_index()) - .filter(|ni| { - matches!( - self.layout - .geometry() - .edge_weight( - self.layout - .geometry() - .find_edge_undirected(self.index.node_index(), *ni) - .unwrap() - .0, - ) - .unwrap(), - GeometryLabel::Adjacent - ) - }) + self.adjacents() + .into_iter() .filter(|ni| { matches!( self.layout.geometry().node_weight(*ni).unwrap(), @@ -334,24 +318,8 @@ impl<'a> LooseDot<'a> { } pub fn bend(&self) -> LooseBendIndex { - self.layout - .geometry() - .neighbors_undirected(self.index.node_index()) - .filter(|ni| { - matches!( - self.layout - .geometry() - .edge_weight( - self.layout - .geometry() - .find_edge_undirected(self.index.node_index(), *ni) - .unwrap() - .0, - ) - .unwrap(), - GeometryLabel::Adjacent - ) - }) + self.adjacents() + .into_iter() .filter(|ni| { matches!( self.layout.geometry().node_weight(*ni).unwrap(),