From eeb442b6d09c96754041515e706291c572914412 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Thu, 3 Nov 2022 15:47:38 +0100 Subject: [PATCH] Bump rustc to 1.65 --- .github/workflows/ci.yaml | 4 ++-- Dockerfile | 2 +- crates/handlers/src/oauth2/userinfo.rs | 2 +- crates/iana-codegen/src/main.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7fe2cd93..e249f9b1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -88,8 +88,8 @@ jobs: - name: Install toolchain run: | - rustup toolchain install 1.64.0 - rustup default 1.64.0 + rustup toolchain install 1.65.0 + rustup default 1.65.0 rustup component add clippy - name: Install Protoc diff --git a/Dockerfile b/Dockerfile index 791173a2..5918bc23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # The Debian version and version name must be in sync ARG DEBIAN_VERSION=11 ARG DEBIAN_VERSION_NAME=bullseye -ARG RUSTC_VERSION=1.64.0 +ARG RUSTC_VERSION=1.65.0 ARG ZIG_VERSION=0.9.1 ARG NODEJS_VERSION=18 ARG OPA_VERSION=0.45.0 diff --git a/crates/handlers/src/oauth2/userinfo.rs b/crates/handlers/src/oauth2/userinfo.rs index 9887a6b7..fa28bbfc 100644 --- a/crates/handlers/src/oauth2/userinfo.rs +++ b/crates/handlers/src/oauth2/userinfo.rs @@ -101,7 +101,7 @@ pub async fn get( let (_clock, mut rng) = crate::rng_and_clock()?; let mut conn = pool.acquire().await?; - let session = user_authorization.protected(&mut *conn).await?; + let session = user_authorization.protected(&mut conn).await?; let user = session.browser_session.user; let mut user_info = UserInfo { diff --git a/crates/iana-codegen/src/main.rs b/crates/iana-codegen/src/main.rs index e140a4ff..71a5230b 100644 --- a/crates/iana-codegen/src/main.rs +++ b/crates/iana-codegen/src/main.rs @@ -56,7 +56,7 @@ impl File { #[tracing::instrument(skip_all, fields(url))] async fn load(mut self) -> anyhow::Result { - tracing::Span::current().record("url", &T::URL); + tracing::Span::current().record("url", T::URL); self.sections.extend(T::sections()); for (key, value) in T::fetch(&self.client).await? { self.items.entry(key).or_default().push(value);