Skip to content
This repository has been archived by the owner on Sep 10, 2024. It is now read-only.

Commit

Permalink
Bump Clippy to 1.75 and Rust to 1.76
Browse files Browse the repository at this point in the history
  • Loading branch information
sandhose committed Feb 27, 2024
1 parent 65f164d commit 2c9b8a4
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##
Expand Down
2 changes: 1 addition & 1 deletion crates/http/tests/client_layers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions crates/i18n-scan/src/key.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ impl Context {
});

let key = translatable
.key
.name
.split('.')
.chain(if translatable.kind == Kind::Plural {
Some("other")
Expand Down Expand Up @@ -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,
}
}
Expand Down
2 changes: 1 addition & 1 deletion crates/i18n-scan/src/minijinja.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 1 addition & 0 deletions crates/oidc-client/src/types/client_credentials.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions crates/storage-pg/src/user/session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ impl<'c> PgBrowserSessionRepository<'c> {
}
}

#[allow(clippy::struct_field_names)]
#[derive(sqlx::FromRow)]
#[sea_query::enum_def]
struct SessionLookup {
Expand Down

0 comments on commit 2c9b8a4

Please sign in to comment.