merge: #3982

3982: build(deps): update to Rust 1.79.0 r=fnichol a=fnichol • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/bedc47af18fc41bb7d2edc2b212d59ca36253f59' (2024-06-11) → 'github:oxalica/rust-overlay/419e7fae2731f41dd9b3e34dfe8802be68558b92' (2024-06-14) https://blog.rust-lang.org/2024/06/13/Rust-1.79.0.html Co-authored-by: Fletcher Nichol <[email protected]>
systeminit · Jun 14, 2024 · 45c6454 · 45c6454
2 parents a929d28 + 965761d
commit 45c6454
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 31 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/lib/dal/src/socket/debug.rs b/lib/dal/src/socket/debug.rs
@@ -78,10 +78,8 @@ impl SocketDebugView {
             .into_iter()
             .map(|f| f.to_string())
             .collect();
-        let path = match AttributeValue::get_path_for_id(ctx, attribute_value_id).await? {
-            Some(path) => path,
-            None => String::new(),
-        };
+        let path =
+            (AttributeValue::get_path_for_id(ctx, attribute_value_id).await?).unwrap_or_default();
 
         let view = attribute_value.view(ctx).await?;
         let inferred_connections: Vec<Ulid> =
@@ -126,10 +124,8 @@ impl SocketDebugView {
             .into_iter()
             .map(|f| f.to_string())
             .collect();
-        let path = match AttributeValue::get_path_for_id(ctx, attribute_value_id).await? {
-            Some(path) => path,
-            None => String::new(),
-        };
+        let path =
+            (AttributeValue::get_path_for_id(ctx, attribute_value_id).await?).unwrap_or_default();
         let value_view = attribute_value.view(ctx).await?;
         let inferred_connections =
             Component::find_available_inferred_connections_to_input_socket(ctx, input_socket_match)

diff --git a/lib/module-index-server/src/extract.rs b/lib/module-index-server/src/extract.rs
@@ -11,20 +11,6 @@ use ulid::Ulid;
 use super::app_state::AppState;
 use crate::jwt_key::{JwtKeyError, JwtPublicSigningKey};
 
-pub struct PosthogClient(pub super::app_state::PosthogClient);
-
-#[async_trait]
-impl FromRequestParts<AppState> for PosthogClient {
-    type Rejection = (StatusCode, Json<serde_json::Value>);
-
-    async fn from_request_parts(
-        _parts: &mut Parts,
-        state: &AppState,
-    ) -> Result<Self, Self::Rejection> {
-        Ok(Self(state.posthog_client().clone()))
-    }
-}
-
 pub struct ExtractedS3Bucket(pub S3Bucket);
 
 #[async_trait]

diff --git a/lib/naxum/src/extract.rs b/lib/naxum/src/extract.rs
@@ -4,7 +4,7 @@ use async_trait::async_trait;
 
 use crate::{message::Head, response::IntoResponse, MessageHead};
 
-mod message_parts;
+pub mod message_parts;
 pub mod rejection;
 mod state;
 mod tuple;

diff --git a/lib/sdf-server/src/server/service/graphviz.rs b/lib/sdf-server/src/server/service/graphviz.rs
@@ -138,7 +138,7 @@ pub async fn schema_variant(
                 let rel_edges = workspace_snapshot
                     .get_edges_between_nodes(id, target.id())
                     .await?;
-                rel_edges.iter().enumerate().for_each(|(_, edge)| {
+                rel_edges.iter().for_each(|edge| {
                     edges.push(GraphVizEdge {
                         from: id,
                         to: target.id(),
@@ -185,7 +185,7 @@ pub async fn schema_variant(
                 let rel_edges = workspace_snapshot
                     .get_edges_between_nodes(source.id(), id)
                     .await?;
-                rel_edges.iter().enumerate().for_each(|(_, edge)| {
+                rel_edges.iter().for_each(|edge| {
                     edges.push(GraphVizEdge {
                         from: source.id(),
                         to: id,
@@ -232,7 +232,7 @@ pub async fn schema_variant(
                     let rel_edges = workspace_snapshot
                         .get_edges_between_nodes(cat_inner.id(), func_id)
                         .await?;
-                    rel_edges.iter().enumerate().for_each(|(_, edge)| {
+                    rel_edges.iter().for_each(|edge| {
                         edges.push(GraphVizEdge {
                             from: cat_inner.id(),
                             to: func_id,
@@ -269,7 +269,7 @@ pub async fn schema_variant(
                                 let rel_edges = workspace_snapshot
                                     .get_edges_between_nodes(root_content.id(), cat_inner.id())
                                     .await?;
-                                rel_edges.iter().enumerate().for_each(|(_, edge)| {
+                                rel_edges.iter().for_each(|edge| {
                                     edges.push(GraphVizEdge {
                                         from: root_content.id(),
                                         to: cat_inner.id(),
@@ -340,7 +340,7 @@ pub async fn components(
                     let rel_edges = workspace_snapshot
                         .get_edges_between_nodes(id, target.id())
                         .await?;
-                    rel_edges.iter().enumerate().for_each(|(_, edge)| {
+                    rel_edges.iter().for_each(|edge| {
                         edges.push(GraphVizEdge {
                             from: id,
                             to: target.id(),