chore: make clippy happy

mrizzi · Jan 21, 2025 · cd155b7 · cd155b7
1 parent e0c5ba7
commit cd155b7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/modules/analysis/src/endpoints/test.rs b/modules/analysis/src/endpoints/test.rs
@@ -189,8 +189,7 @@ async fn test_simple_dep_endpoint(ctx: &TrustifyContext) -> Result<(), anyhow::E
     let purls = response["items"][0]["deps"]
         .as_array()
         .iter()
-        .map(|deps| *deps)
-        .flatten()
+        .flat_map(|deps| *deps)
         .flat_map(|dep| dep["purl"].as_array())
         .flatten()
         .flat_map(|purl| purl.as_str().map(|s| s.to_string()))

diff --git a/modules/analysis/src/service/load.rs b/modules/analysis/src/service/load.rs
@@ -88,7 +88,7 @@ pub async fn get_nodes<C: ConnectionTrait>(
     let stmt =
         Statement::from_sql_and_values(DatabaseBackend::Postgres, sql, [distinct_sbom_id.into()]);
 
-    Ok(Node::find_by_statement(stmt).all(connection).await?)
+    Node::find_by_statement(stmt).all(connection).await
 }
 
 #[instrument(skip(connection))]
@@ -268,22 +268,19 @@ impl AnalysisService {
             log::debug!("Adding edge {:?}", edge);
 
             // insert edge into the graph
-            match (
+            if let (Some(left), Some(right)) = (
                 nodes.get(&edge.left_node_id),
                 nodes.get(&edge.right_node_id),
             ) {
-                (Some(left), Some(right)) => {
-                    if edge.relationship == Relationship::DescribedBy {
-                        describedby_node_id.push(*left);
-                    }
+                if edge.relationship == Relationship::DescribedBy {
+                    describedby_node_id.push(*left);
+                }
 
-                    // remove all node IDs we somehow connected
-                    detected_nodes.remove(&edge.left_node_id);
-                    detected_nodes.remove(&edge.right_node_id);
+                // remove all node IDs we somehow connected
+                detected_nodes.remove(&edge.left_node_id);
+                detected_nodes.remove(&edge.right_node_id);
 
-                    g.add_edge(*left, *right, edge.relationship);
-                }
-                _ => {}
+                g.add_edge(*left, *right, edge.relationship);
             }
         }
 

diff --git a/modules/analysis/src/test.rs b/modules/analysis/src/test.rs
@@ -64,7 +64,7 @@ where
         .map(|item| {
             item.ancestors
                 .iter()
-                .map(|anc| OwnedNode::from(anc))
+                .map(OwnedNode::from)
                 .sorted_by_key(|n| n.id.to_string())
                 .collect::<Vec<_>>()
         })