From 5c8b4427472ec5e8948b41795fd055f2ec84bdbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Fri, 12 Aug 2022 10:24:16 +0200 Subject: [PATCH] Fix new clippy 0.1.63 warnings --- crates/data-model/src/compat.rs | 2 +- crates/data-model/src/oauth2/client.rs | 2 +- crates/data-model/src/tokens.rs | 2 +- crates/data-model/src/users.rs | 2 +- crates/http/src/layers/json.rs | 2 +- crates/oauth2-types/src/pkce.rs | 2 +- crates/oauth2-types/src/requests.rs | 14 +++++++------- crates/storage/src/lib.rs | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/crates/data-model/src/compat.rs b/crates/data-model/src/compat.rs index 7bb97933..07d90c14 100644 --- a/crates/data-model/src/compat.rs +++ b/crates/data-model/src/compat.rs @@ -26,7 +26,7 @@ use crate::{StorageBackend, StorageBackendMarker, User}; static DEVICE_ID_LENGTH: usize = 10; -#[derive(Debug, Clone, PartialEq, Serialize)] +#[derive(Debug, Clone, PartialEq, Eq, Serialize)] #[serde(transparent)] pub struct Device { id: String, diff --git a/crates/data-model/src/oauth2/client.rs b/crates/data-model/src/oauth2/client.rs index 27fd7037..f8ffdd92 100644 --- a/crates/data-model/src/oauth2/client.rs +++ b/crates/data-model/src/oauth2/client.rs @@ -24,7 +24,7 @@ use url::Url; use crate::traits::{StorageBackend, StorageBackendMarker}; -#[derive(Debug, Clone, PartialEq, Serialize)] +#[derive(Debug, Clone, PartialEq, Eq, Serialize)] #[serde(rename_all = "snake_case")] pub enum JwksOrJwksUri { /// Client's JSON Web Key Set document, passed by value. diff --git a/crates/data-model/src/tokens.rs b/crates/data-model/src/tokens.rs index 37a67bbf..3bc3b3ca 100644 --- a/crates/data-model/src/tokens.rs +++ b/crates/data-model/src/tokens.rs @@ -200,7 +200,7 @@ fn base62_encode(mut num: u32) -> String { const CRC: Crc = Crc::::new(&CRC_32_ISO_HDLC); /// Invalid token -#[derive(Debug, Error, PartialEq)] +#[derive(Debug, Error, PartialEq, Eq)] pub enum TokenFormatError { /// Overall token format is invalid #[error("invalid token format")] diff --git a/crates/data-model/src/users.rs b/crates/data-model/src/users.rs index cfb9c00e..4e10aaf6 100644 --- a/crates/data-model/src/users.rs +++ b/crates/data-model/src/users.rs @@ -161,7 +161,7 @@ where } } -#[derive(Debug, Clone, PartialEq, Serialize)] +#[derive(Debug, Clone, PartialEq, Eq, Serialize)] pub enum UserEmailVerificationState { AlreadyUsed { when: DateTime }, Expired, diff --git a/crates/http/src/layers/json.rs b/crates/http/src/layers/json.rs index db620f86..30c28204 100644 --- a/crates/http/src/layers/json.rs +++ b/crates/http/src/layers/json.rs @@ -100,7 +100,7 @@ where .await .map_err(Error::body)?; - let body = serde_json::from_slice(&bytes.to_vec()).map_err(Error::json)?; + let body = serde_json::from_slice(&bytes).map_err(Error::json)?; let res = Response::from_parts(parts, body); Ok(res) diff --git a/crates/oauth2-types/src/pkce.rs b/crates/oauth2-types/src/pkce.rs index 0dc29ad0..97321ec5 100644 --- a/crates/oauth2-types/src/pkce.rs +++ b/crates/oauth2-types/src/pkce.rs @@ -20,7 +20,7 @@ use serde::{Deserialize, Serialize}; use sha2::{Digest, Sha256}; use thiserror::Error; -#[derive(Debug, Error, PartialEq)] +#[derive(Debug, Error, PartialEq, Eq)] pub enum CodeChallengeError { #[error("code_verifier should be at least 43 characters long")] TooShort, diff --git a/crates/oauth2-types/src/requests.rs b/crates/oauth2-types/src/requests.rs index 5bfb153d..7418cfd6 100644 --- a/crates/oauth2-types/src/requests.rs +++ b/crates/oauth2-types/src/requests.rs @@ -150,7 +150,7 @@ pub struct AuthorizationResponse { } #[skip_serializing_none] -#[derive(Serialize, Deserialize, Debug, PartialEq)] +#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)] pub struct AuthorizationCodeGrant { pub code: String, #[serde(default)] @@ -161,7 +161,7 @@ pub struct AuthorizationCodeGrant { pub code_verifier: Option, } -#[derive(Serialize, Deserialize, Debug, PartialEq)] +#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)] pub struct RefreshTokenGrant { pub refresh_token: String, @@ -169,7 +169,7 @@ pub struct RefreshTokenGrant { scope: Option, } -#[derive(Serialize, Deserialize, Debug, PartialEq)] +#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)] pub struct ClientCredentialsGrant { #[serde(default)] scope: Option, @@ -197,7 +197,7 @@ pub enum GrantType { ClientCredentials, } -#[derive(Serialize, Deserialize, Debug, PartialEq)] +#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)] #[serde(tag = "grant_type", rename_all = "snake_case")] pub enum AccessTokenRequest { AuthorizationCode(AuthorizationCodeGrant), @@ -209,7 +209,7 @@ pub enum AccessTokenRequest { #[serde_as] #[skip_serializing_none] -#[derive(Serialize, Deserialize, Debug, PartialEq)] +#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)] pub struct AccessTokenResponse { access_token: String, refresh_token: Option, @@ -263,7 +263,7 @@ impl AccessTokenResponse { } #[skip_serializing_none] -#[derive(Serialize, Deserialize, Debug, PartialEq)] +#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)] pub struct IntrospectionRequest { pub token: String, @@ -273,7 +273,7 @@ pub struct IntrospectionRequest { #[serde_as] #[skip_serializing_none] -#[derive(Serialize, Deserialize, Debug, PartialEq, Default)] +#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Default)] pub struct IntrospectionResponse { pub active: bool, diff --git a/crates/storage/src/lib.rs b/crates/storage/src/lib.rs index d015777e..fcf6ea5c 100644 --- a/crates/storage/src/lib.rs +++ b/crates/storage/src/lib.rs @@ -33,7 +33,7 @@ use thiserror::Error; #[error("database query returned an inconsistent state")] pub struct DatabaseInconsistencyError; -#[derive(Serialize, Debug, Clone, PartialEq)] +#[derive(Serialize, Debug, Clone, PartialEq, Eq)] pub struct PostgresqlBackend; impl StorageBackend for PostgresqlBackend {