Upgrade to Rust 1.86.0 (#1918)

<!-- The PR description should answer 2 important questions: -->

### What

New `rustc` version. Upgrade and fix lints (mostly automatically).

V3_GIT_ORIGIN_REV_ID: e92532a8ae56e9d660401ed772536bd9018d8fe1

Author: danieljharvey

v3/Dockerfile

@@ -1,5 +1,5 @@
 # This should match the Rust version in rust-toolchain.yaml and the other Dockerfiles.
-FROM rust:1.85.0 AS chef
+FROM rust:1.86.0 AS chef
 
 WORKDIR /app
 

v3/crates/auth/hasura-authn-jwt/src/jwt.rs

@@ -580,15 +580,15 @@ pub(crate) async fn decode_and_parse_hasura_claims(
     // Additional validations according to the `jwt_config`.
     if let Some(aud) = &jwt_config.audience {
         validation.set_audience(&aud.iter().collect::<Vec<_>>());
-    };
+    }
 
     if let Some(issuer) = &jwt_config.issuer {
         validation.set_issuer(&[issuer]);
-    };
+    }
 
     if let Some(leeway) = jwt_config.allowed_skew {
         validation.leeway = leeway;
-    };
+    }
 
     let claims: serde_json::Value = decode(&jwt, &decoding_key, &validation)
         .map_err(InternalError::JWTDecodingError)?

v3/crates/auth/hasura-authn/src/lib.rs

@@ -281,7 +281,7 @@ fn validate_auth_config(auth_config: &AuthConfig) -> Result<Vec<Warning>, Error>
                             .and_then(|c| c.headers.as_ref())
                         {
                             warnings.extend(validate_header_config(headers_config));
-                        };
+                        }
                     }
                     webhook::AuthHookConfigV3::POST(config) => {
                         if let Some(headers_config) = config
@@ -290,15 +290,15 @@ fn validate_auth_config(auth_config: &AuthConfig) -> Result<Vec<Warning>, Error>
                             .and_then(|c| c.headers.as_ref())
                         {
                             warnings.extend(validate_header_config(headers_config));
-                        };
+                        }
                         if let Some(body_header_config) = config
                             .custom_headers_config
                             .as_ref()
                             .and_then(|c| c.body.as_ref())
                             .and_then(|c| c.headers.as_ref())
                         {
                             warnings.extend(validate_header_config(body_header_config));
-                        };
+                        }
                     }
                 }
             }

v3/crates/custom-connector/src/collections/institutions.rs

@@ -84,7 +84,7 @@ fn check_institution_query<'a>(
                 return true;
             }
         }
-    };
+    }
 
     // check location
     if let Some(query_location) = &institution_query.location {
@@ -118,7 +118,7 @@ fn check_institution_query<'a>(
                 }
             }
         }
-    };
+    }
 
     // TODO: implement filters for the other fields
 

v3/crates/engine/tests/common.rs

@@ -796,7 +796,7 @@ async fn run_query_graphql_ws(
             graphql_ws::Message::Raw(_) => {
                 panic!("Expected a Complete message")
             }
-        };
+        }
     }
     response
 }

v3/crates/execute/src/execute/remote_joins/collect.rs

@@ -103,7 +103,7 @@ fn collect_argument_from_rows(
                     ProcessResponseAs::Array { .. } | ProcessResponseAs::Object { .. } => {
                         collect_argument_from_row(row, join_fields, path, &mut arguments)?;
                     }
-                    ProcessResponseAs::Aggregates { .. } => {
+                    ProcessResponseAs::Aggregates => {
                         return Err(error::FieldInternalError::InternalGeneric {
                             description:
                                 "Unexpected aggregate response on the LHS of a remote join"

v3/crates/execute/src/execute/remote_joins/join.rs

@@ -49,7 +49,7 @@ pub(crate) fn join_responses(
                             rhs_response,
                         )?;
                     }
-                };
+                }
             }
         }
     }
@@ -198,43 +198,41 @@ fn visit_location_path_and_insert_value(
             row_set.rows = Some(rows);
             *row_field_val = ndc_models::RowFieldValue(json::to_value(row_set)?);
         }
-        LocationKind::NestedData => {
-            match row_field_val.0 {
-                serde_json::Value::Array(_) => {
-                    if let Ok(mut rows) = serde_json::from_value::<
-                        Vec<IndexMap<ndc_models::FieldName, ndc_models::RowFieldValue>>,
-                    >(row_field_val.0.clone())
-                    {
-                        for inner_row in &mut rows {
-                            insert_value_into_row(
-                                path_tail,
-                                join_node,
-                                inner_row,
-                                remote_alias.clone(),
-                                rhs_response,
-                            )?;
-                        }
-                        *row_field_val = ndc_models::RowFieldValue(json::to_value(rows)?);
-                    }
-                }
-                serde_json::Value::Object(_) => {
-                    if let Ok(mut inner_row) = serde_json::from_value::<
-                        IndexMap<ndc_models::FieldName, ndc_models::RowFieldValue>,
-                    >(row_field_val.0.clone())
-                    {
+        LocationKind::NestedData => match row_field_val.0 {
+            serde_json::Value::Array(_) => {
+                if let Ok(mut rows) = serde_json::from_value::<
+                    Vec<IndexMap<ndc_models::FieldName, ndc_models::RowFieldValue>>,
+                >(row_field_val.0.clone())
+                {
+                    for inner_row in &mut rows {
                         insert_value_into_row(
                             path_tail,
                             join_node,
-                            &mut inner_row,
-                            remote_alias,
+                            inner_row,
+                            remote_alias.clone(),
                             rhs_response,
                         )?;
-                        *row_field_val = ndc_models::RowFieldValue(json::to_value(inner_row)?);
                     }
+                    *row_field_val = ndc_models::RowFieldValue(json::to_value(rows)?);
                 }
-                _ => (),
-            };
-        }
+            }
+            serde_json::Value::Object(_) => {
+                if let Ok(mut inner_row) = serde_json::from_value::<
+                    IndexMap<ndc_models::FieldName, ndc_models::RowFieldValue>,
+                >(row_field_val.0.clone())
+                {
+                    insert_value_into_row(
+                        path_tail,
+                        join_node,
+                        &mut inner_row,
+                        remote_alias,
+                        rhs_response,
+                    )?;
+                    *row_field_val = ndc_models::RowFieldValue(json::to_value(inner_row)?);
+                }
+            }
+            _ => (),
+        },
     }
     Ok(())
 }

v3/crates/graphql/frontend/src/explain.rs

@@ -376,7 +376,7 @@ async fn get_execution_steps(
         }
         ProcessResponseAs::Array { .. }
         | ProcessResponseAs::Object { .. }
-        | ProcessResponseAs::Aggregates { .. } => {
+        | ProcessResponseAs::Aggregates => {
             // A model execution node
             let data_connector_explain = fetch_explain_from_data_connector(
                 expose_internal_errors,
@@ -398,7 +398,7 @@ async fn get_execution_steps(
     {
         sequence_steps.push(Box::new(types::Step::Sequence(join_steps)));
         sequence_steps.push(Box::new(types::Step::HashJoin));
-    };
+    }
     Ok(sequence_steps)
 }
 
@@ -564,16 +564,16 @@ async fn get_join_steps(
                     }
                 },
             )));
-        };
+        }
         if let Some(rest_join_steps) =
             get_join_steps(expose_internal_errors, location.rest, http_context).await?
         {
             sequence_steps.push(Box::new(types::Step::Sequence(rest_join_steps)));
             sequence_steps.push(Box::new(types::Step::HashJoin));
-        };
+        }
         if let Some(sequence_steps) = NonEmpty::from_vec(sequence_steps) {
             sequence_join_steps.push(Box::new(types::Step::Sequence(sequence_steps)));
-        };
+        }
     }
     Ok(NonEmpty::from_vec(sequence_join_steps))
 }

v3/crates/graphql/graphql-ws/src/websocket/mod.rs

@@ -259,7 +259,7 @@ async fn start_websocket_session<M: WebSocketMetrics>(
                                 .send(types::Message::internal_server_error())
                                 .await;
                         }
-                    };
+                    }
 
                     // Abort the expiry task
                     if let Some(task) = expiry_task {

v3/crates/graphql/graphql-ws/src/websocket/tasks.rs

@@ -253,7 +253,7 @@ pub(crate) async fn manage_outgoing_messages<M: WebSocketMetrics + Sync>(
                                         // Return error
                                         Err(err)?;
                                     }
-                                };
+                                }
 
                                 // Stop the poller if the operation is complete or an error occurred
                                 if let Some(operation_id) = msg.is_complete_or_error() {