Remove extra lookups and memory allocations from tsort graph construction

Author: Nekrolm

src/uu/tsort/Cargo.toml

@@ -22,6 +22,7 @@ clap = { workspace = true }
 thiserror = { workspace = true }
 uucore = { workspace = true }
 fluent = { workspace = true }
+itertools = {workspace = true }
 
 [[bin]]
 name = "tsort"

src/uu/tsort/src/tsort.rs

@@ -14,6 +14,8 @@ use uucore::{format_usage, show};
 
 use uucore::translate;
 
+use itertools::Itertools;
+
 mod options {
     pub const FILE: &str = "file";
 }
@@ -63,11 +65,15 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 
     // Create the directed graph from pairs of tokens in the input data.
     let mut g = Graph::new(input.to_string_lossy().to_string());
-    for ab in data.split_whitespace().collect::<Vec<&str>>().chunks(2) {
-        match ab {
-            [a, b] => g.add_edge(a, b),
-            _ => return Err(TsortError::NumTokensOdd(input.to_string_lossy().to_string()).into()),
-        }
+    for mut ab in &data.split_whitespace().chunks(2) {
+        let a = ab.next();
+        let b = ab.next();
+
+        let Some((a, b)) = a.zip(b) else {
+            return Err(TsortError::NumTokensOdd(input.to_string_lossy().to_string()).into());
+        };
+
+        g.add_edge(a, b);
     }
 
     g.run_tsort();
@@ -127,19 +133,11 @@ impl<'input> Graph<'input> {
         }
     }
 
-    fn add_node(&mut self, name: &'input str) {
-        self.nodes.entry(name).or_default();
-    }
-
     fn add_edge(&mut self, from: &'input str, to: &'input str) {
-        self.add_node(from);
+        let from_node = self.nodes.entry(from).or_default();
         if from != to {
-            self.add_node(to);
-
-            let from_node = self.nodes.get_mut(from).unwrap();
             from_node.add_successor(to);
-
-            let to_node = self.nodes.get_mut(to).unwrap();
+            let to_node = self.nodes.entry(to).or_default();
             to_node.predecessor_count += 1;
         }
     }
@@ -233,10 +231,7 @@ impl<'input> Graph<'input> {
 
     fn detect_cycle(&self) -> Vec<&'input str> {
         // Sort the nodes just to make this function deterministic.
-        let mut nodes = Vec::new();
-        for node in self.nodes.keys() {
-            nodes.push(node);
-        }
+        let mut nodes: Vec<_> = self.nodes.keys().copied().collect();
         nodes.sort_unstable();
 
         let mut visited = HashSet::new();