commit ce3313d6b2186d973b05daaabdfbd876b1fa4162
author bluss <bluss@users.noreply.github.com> Sat Nov 17 17:33:49 2018 +0100
committer bluss <bluss@users.noreply.github.com> Sat Nov 17 17:34:37 2018 +0100
tree 534922f954c491a0b39748dd1b83897868d8f30b
parent 777443a719805de6c5ad4bcc9751c9c508a2e828

FIX: Simplify code in EdgeFilteredNeighborsDirected

Remove equivalent branch, remove unused struct field.

src/visit/filter.rs

diff --git a/src/visit/filter.rs b/src/visit/filter.rs
index 271369c..cb64c79 100644
--- a/src/visit/filter.rs
+++ b/src/visit/filter.rs
@@ -348,7 +348,6 @@
         EdgeFilteredNeighborsDirected {
             iter: self.0.edges_directed(n, dir),
             f: &self.1,
-            dir: dir,
             from: n,
         }
     }
@@ -433,7 +432,6 @@
 {
     iter: G::EdgesDirected,
     f: &'a F,
-    dir: Direction,
     from: G::NodeId,
 }
 
@@ -445,18 +443,14 @@
     type Item = G::NodeId;
     fn next(&mut self) -> Option<Self::Item> {
         let f = self.f;
-        let dir = self.dir;
         let from = self.from;
         (&mut self.iter)
             .filter_map(move |edge| {
                 if f.include_edge(edge) {
                     if edge.source() != from {
                         Some(edge.source())
-                    } else if edge.target() != from {
-                        Some(edge.target())
                     } else {
-                        // source == target 
-                        Some(from)
+                        Some(edge.target()) // includes case where from == source == target
                     }
                 } else {
                     None