From 9f1c88b863e247da3cd60d2792a7a13b18e25e53 Mon Sep 17 00:00:00 2001
From: JSDurand <mmemmew@gmail.com>
Date: Wed, 14 Dec 2022 23:48:22 +0800
Subject: a temporary check point

just to save things in a commit
---
 graph/Makefile.am     | 15 +++++++++++----
 graph/src/adlist.rs   |  8 ++++++++
 graph/src/labelled.rs |  2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)

(limited to 'graph')

diff --git a/graph/Makefile.am b/graph/Makefile.am
index 776b911..623572a 100644
--- a/graph/Makefile.am
+++ b/graph/Makefile.am
@@ -1,12 +1,19 @@
-.PHONY: dev rel
+.PHONY: dev rel clean check
 
 all: dev
 
 dev:
-	@CARGO@ build
+	@echo "cargo build"
+	@@CARGO@ build
 
 rel:
-	@CARGO@ build --release
+	@echo "cargo build --release"
+	@@CARGO@ build --release
 
 clean:
-	@CARGO@ clean
+	@echo "cargo clean"
+	@@CARGO@ clean
+
+check:
+	@echo "cargo clippy"
+	@@CARGO@ clippy
diff --git a/graph/src/adlist.rs b/graph/src/adlist.rs
index c16ceb2..18ad770 100644
--- a/graph/src/adlist.rs
+++ b/graph/src/adlist.rs
@@ -102,6 +102,14 @@ impl ExtGraph for ALGraph {
     }
 }
 
+// TODO: Add a way to build a graph by its raw adjacency list representation.
+impl From<Vec<Vec<usize>>> for ALGraph {
+    fn from(adlist: Vec<Vec<usize>>) -> Self {
+        let nodes: Vec<ALNode> = adlist.iter().cloned().map(ALNode::new).collect();
+        Self { nodes }
+    }
+}
+
 #[cfg(test)]
 mod algraph_test {
     use super::*;
diff --git a/graph/src/labelled.rs b/graph/src/labelled.rs
index 1cb2461..d02e301 100644
--- a/graph/src/labelled.rs
+++ b/graph/src/labelled.rs
@@ -144,7 +144,7 @@ impl<'a> Iterator for LabelIndexIter<'a> {
 
     #[inline]
     fn next(&mut self) -> Option<Self::Item> {
-        self.iter.as_mut().map(|iterator| iterator.next()).flatten()
+        self.iter.as_mut().and_then(|iterator| iterator.next())
     }
 
     #[inline]
-- 
cgit v1.2.3-18-g5258