From 4277c1ad40f46828ab2613e5b966333825bdfbb6 Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Tue, 27 Feb 2024 15:41:59 +0100
Subject: [PATCH] Bump Clippy to 1.75 and Rust to 1.76

---
 .github/workflows/ci.yaml                          | 4 ++--
 Dockerfile                                         | 8 ++++----
 crates/http/tests/client_layers.rs                 | 2 +-
 crates/i18n-scan/src/key.rs                        | 8 ++++----
 crates/i18n-scan/src/minijinja.rs                  | 2 +-
 crates/oidc-client/src/types/client_credentials.rs | 1 +
 crates/storage-pg/src/user/session.rs              | 1 +
 7 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b86222a36..fb1c0f15b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -195,8 +195,8 @@ jobs:
 
       - name: Install toolchain
         run: |
-          rustup toolchain install 1.74.0
-          rustup default 1.74.0
+          rustup toolchain install 1.75.0
+          rustup default 1.75.0
           rustup component add clippy
 
       - name: Setup OPA
diff --git a/Dockerfile b/Dockerfile
index 884d83c92..f6ed468da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,15 +8,15 @@
 # The Debian version and version name must be in sync
 ARG DEBIAN_VERSION=12
 ARG DEBIAN_VERSION_NAME=bookworm
-ARG RUSTC_VERSION=1.74.0
+ARG RUSTC_VERSION=1.76.0
 # XXX: Upgrade to 0.10.0 blocked by https://github.com/ziglang/zig/issues/10915#issuecomment-1354548110
 # XXX: Upgrade to 0.11.0 blocked by https://github.com/rust-cross/cargo-zigbuild/issues/162
 ARG ZIG_VERSION=0.9.1
 ARG NODEJS_VERSION=20.9.0
 ARG OPA_VERSION=0.59.0
-ARG CARGO_AUDITABLE_VERSION=0.6.1
-ARG CARGO_CHEF_VERSION=0.1.62
-ARG CARGO_ZIGBUILD_VERSION=0.17.5
+ARG CARGO_AUDITABLE_VERSION=0.6.2
+ARG CARGO_CHEF_VERSION=0.1.64
+ARG CARGO_ZIGBUILD_VERSION=0.18.3
 
 ##########################################
 ## Build stage that builds the frontend ##
diff --git a/crates/http/tests/client_layers.rs b/crates/http/tests/client_layers.rs
index 8fa45e37e..f04eb744a 100644
--- a/crates/http/tests/client_layers.rs
+++ b/crates/http/tests/client_layers.rs
@@ -34,7 +34,7 @@ struct Error {
 
 #[tokio::test]
 async fn test_http_errors() {
-    async fn handle<B>(_request: Request<B>) -> Result<Response<String>, Infallible> {
+    async fn handle<B>(_: Request<B>) -> Result<Response<String>, Infallible> {
         let mut res = Response::new(r#"{"error": "invalid_request"}"#.to_owned());
         *res.status_mut() = StatusCode::BAD_REQUEST;
 
diff --git a/crates/i18n-scan/src/key.rs b/crates/i18n-scan/src/key.rs
index cdb15be46..b065cb9df 100644
--- a/crates/i18n-scan/src/key.rs
+++ b/crates/i18n-scan/src/key.rs
@@ -69,7 +69,7 @@ impl Context {
             });
 
             let key = translatable
-                .key
+                .name
                 .split('.')
                 .chain(if translatable.kind == Kind::Plural {
                     Some("other")
@@ -111,15 +111,15 @@ pub struct Location {
 #[derive(Debug, Clone)]
 pub struct Key {
     kind: Kind,
-    key: String,
+    name: String,
     location: Option<Location>,
 }
 
 impl Key {
-    pub fn new(kind: Kind, key: String) -> Self {
+    pub fn new(kind: Kind, name: String) -> Self {
         Self {
             kind,
-            key,
+            name,
             location: None,
         }
     }
diff --git a/crates/i18n-scan/src/minijinja.rs b/crates/i18n-scan/src/minijinja.rs
index 412d8e0cd..d99368909 100644
--- a/crates/i18n-scan/src/minijinja.rs
+++ b/crates/i18n-scan/src/minijinja.rs
@@ -122,7 +122,7 @@ fn find_in_call<'a>(
         if var_.id == context.func() {
             let key = call
                 .args
-                .get(0)
+                .first()
                 .and_then(as_const)
                 .and_then(|const_| const_.value.as_str())
                 .ok_or(minijinja::Error::new(
diff --git a/crates/oidc-client/src/types/client_credentials.rs b/crates/oidc-client/src/types/client_credentials.rs
index 0ac965410..d760447d6 100644
--- a/crates/oidc-client/src/types/client_credentials.rs
+++ b/crates/oidc-client/src/types/client_credentials.rs
@@ -368,6 +368,7 @@ impl RequestClientCredentials {
     }
 }
 
+#[allow(clippy::struct_field_names)] // All the fields start with `client_`
 #[skip_serializing_none]
 #[derive(Debug, Clone, PartialEq, Eq, Serialize)]
 pub(crate) struct BodyClientCredentials {
diff --git a/crates/storage-pg/src/user/session.rs b/crates/storage-pg/src/user/session.rs
index f7cafd644..0ec57481f 100644
--- a/crates/storage-pg/src/user/session.rs
+++ b/crates/storage-pg/src/user/session.rs
@@ -49,6 +49,7 @@ impl<'c> PgBrowserSessionRepository<'c> {
     }
 }
 
+#[allow(clippy::struct_field_names)]
 #[derive(sqlx::FromRow)]
 #[sea_query::enum_def]
 struct SessionLookup {