From 56cf3ce94cdc61d29df14cba06363ad2733a9668 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Tue, 7 Jun 2022 18:15:05 +0200 Subject: [PATCH] Allow buggy clippy lint on a per-crate basis The previous method of allowing it through .cargo/config.toml doesn't seem to work anymore. --- .cargo/config.toml | 2 -- crates/ruma-client-api/src/lib.rs | 2 ++ crates/ruma-common/src/lib.rs | 2 ++ crates/ruma-common/tests/serde/empty_strings.rs | 3 +++ crates/ruma-common/tests/serde/enum_derive.rs | 3 +++ crates/ruma-common/tests/serde/url_deserialize.rs | 3 +++ crates/ruma-macros/src/lib.rs | 2 ++ xtask/src/main.rs | 2 ++ 8 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 6a1d4583..4d27c747 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -44,8 +44,6 @@ rustflags = [ "-Wclippy::unreadable_literal", "-Wclippy::unseparated_literal_suffix", "-Wclippy::wildcard_imports", - # https://github.com/rust-lang/rust-clippy/issues/8875 - "-Aclippy::derive_partial_eq_without_eq", ] # activate the target-applies-to-host feature. diff --git a/crates/ruma-client-api/src/lib.rs b/crates/ruma-client-api/src/lib.rs index 94d8b105..364e6d9b 100644 --- a/crates/ruma-client-api/src/lib.rs +++ b/crates/ruma-client-api/src/lib.rs @@ -6,6 +6,8 @@ //! [client-api]: https://spec.matrix.org/v1.2/client-server-api/ #![warn(missing_docs)] +// https://github.com/rust-lang/rust-clippy/issues/8875 +#![allow(clippy::derive_partial_eq_without_eq)] #![cfg_attr(docsrs, feature(doc_auto_cfg))] pub mod account; diff --git a/crates/ruma-common/src/lib.rs b/crates/ruma-common/src/lib.rs index b12a8e82..ed745e26 100644 --- a/crates/ruma-common/src/lib.rs +++ b/crates/ruma-common/src/lib.rs @@ -4,6 +4,8 @@ #![recursion_limit = "1024"] #![warn(missing_docs)] +// https://github.com/rust-lang/rust-clippy/issues/8875 +#![allow(clippy::derive_partial_eq_without_eq)] #![cfg_attr(docsrs, feature(doc_auto_cfg))] #[cfg(not(all(feature = "client", feature = "server")))] diff --git a/crates/ruma-common/tests/serde/empty_strings.rs b/crates/ruma-common/tests/serde/empty_strings.rs index cc0d8c9f..2ba582b8 100644 --- a/crates/ruma-common/tests/serde/empty_strings.rs +++ b/crates/ruma-common/tests/serde/empty_strings.rs @@ -1,3 +1,6 @@ +// https://github.com/rust-lang/rust-clippy/issues/8875 +#![allow(clippy::derive_partial_eq_without_eq)] + mod string { use serde::{Deserialize, Serialize}; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; diff --git a/crates/ruma-common/tests/serde/enum_derive.rs b/crates/ruma-common/tests/serde/enum_derive.rs index ecbcf58b..f405ffc8 100644 --- a/crates/ruma-common/tests/serde/enum_derive.rs +++ b/crates/ruma-common/tests/serde/enum_derive.rs @@ -1,3 +1,6 @@ +// https://github.com/rust-lang/rust-clippy/issues/8875 +#![allow(clippy::derive_partial_eq_without_eq)] + use ruma_common::serde::StringEnum; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; diff --git a/crates/ruma-common/tests/serde/url_deserialize.rs b/crates/ruma-common/tests/serde/url_deserialize.rs index 8d15b1ed..6308e61a 100644 --- a/crates/ruma-common/tests/serde/url_deserialize.rs +++ b/crates/ruma-common/tests/serde/url_deserialize.rs @@ -1,3 +1,6 @@ +// https://github.com/rust-lang/rust-clippy/issues/8875 +#![allow(clippy::derive_partial_eq_without_eq)] + use assert_matches::assert_matches; use form_urlencoded::Serializer as Encoder; use ruma_common::serde::urlencoded; diff --git a/crates/ruma-macros/src/lib.rs b/crates/ruma-macros/src/lib.rs index 9f85c629..99717288 100644 --- a/crates/ruma-macros/src/lib.rs +++ b/crates/ruma-macros/src/lib.rs @@ -5,6 +5,8 @@ //! See the documentation for the individual macros for usage details. #![warn(missing_docs)] +// https://github.com/rust-lang/rust-clippy/issues/8875 +#![allow(clippy::derive_partial_eq_without_eq)] use identifiers::expand_id_zst; use proc_macro::TokenStream; diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 3ef04659..cd1e9fee 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -4,6 +4,8 @@ //! `.cargo/config`. Run commands as `cargo xtask [command]`. #![allow(clippy::exhaustive_structs)] +// https://github.com/rust-lang/rust-clippy/issues/8875 +#![allow(clippy::derive_partial_eq_without_eq)] use std::path::PathBuf;