diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ed02c3268..efebe3d05 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -195,8 +195,8 @@ jobs: - name: Install toolchain run: | - rustup toolchain install 1.78.0 - rustup default 1.78.0 + rustup toolchain install 1.80.0 + rustup default 1.80.0 rustup component add clippy - name: Setup OPA diff --git a/Cargo.toml b/Cargo.toml index e0ecdebfd..e0844073a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,8 +16,9 @@ package.repository = "https://github.com/matrix-org/matrix-authentication-servic unsafe_code = "forbid" [workspace.lints.clippy] -all = "deny" -pedantic = "warn" +# We use groups as good defaults, but with a lower priority so that we can override them +all = { level = "deny", priority = -1 } +pedantic = { level = "warn", priority = -1 } str_to_string = "deny" diff --git a/Dockerfile b/Dockerfile index 56b229571..f81e2c9e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ # The Debian version and version name must be in sync ARG DEBIAN_VERSION=12 ARG DEBIAN_VERSION_NAME=bookworm -ARG RUSTC_VERSION=1.78.0 +ARG RUSTC_VERSION=1.80.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