From c885257e5200e568df9dfb155a2b329d45af377f Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Tue, 25 Jun 2024 11:17:32 +0200 Subject: [PATCH] clippy: rm outdated clippy allow (#9070) --- Cargo.lock | 45 +++++++++++++-------- Cargo.toml | 2 +- crates/ethereum-forks/src/lib.rs | 2 - crates/net/eth-wire-types/src/lib.rs | 2 - crates/net/eth-wire/src/lib.rs | 2 - crates/net/eth-wire/tests/fuzz_roundtrip.rs | 3 -- crates/primitives-traits/src/lib.rs | 2 - crates/primitives/src/lib.rs | 2 - crates/prune/types/src/lib.rs | 2 - crates/stages/types/src/lib.rs | 2 - crates/storage/codecs/src/lib.rs | 2 - crates/storage/db-api/src/lib.rs | 2 - crates/storage/db/src/tables/mod.rs | 3 -- crates/trie/common/src/lib.rs | 2 - 14 files changed, 29 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7d76d53b80a0..9699f5ebf503 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -134,7 +134,7 @@ dependencies = [ "arbitrary", "c-kzg", "proptest", - "proptest-derive", + "proptest-derive 0.4.0", "serde", ] @@ -170,7 +170,7 @@ dependencies = [ "derive_more", "once_cell", "proptest", - "proptest-derive", + "proptest-derive 0.4.0", "serde", "sha2 0.10.8", ] @@ -267,7 +267,7 @@ dependencies = [ "k256", "keccak-asm", "proptest", - "proptest-derive", + "proptest-derive 0.4.0", "rand 0.8.5", "ruint", "serde", @@ -459,7 +459,7 @@ dependencies = [ "itertools 0.13.0", "jsonrpsee-types", "proptest", - "proptest-derive", + "proptest-derive 0.4.0", "serde", "serde_json", "thiserror", @@ -500,7 +500,7 @@ dependencies = [ "alloy-primitives", "arbitrary", "proptest", - "proptest-derive", + "proptest-derive 0.4.0", "serde", "serde_json", ] @@ -693,7 +693,7 @@ dependencies = [ "hashbrown 0.14.5", "nybbles", "proptest", - "proptest-derive", + "proptest-derive 0.4.0", "serde", "smallvec", "tracing", @@ -5959,6 +5959,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "proptest-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.67", +] + [[package]] name = "prost" version = "0.12.6" @@ -6719,7 +6730,7 @@ dependencies = [ "modular-bitfield", "proptest", "proptest-arbitrary-interop", - "proptest-derive", + "proptest-derive 0.5.0", "reth-codecs-derive", "serde", "serde_json", @@ -6849,7 +6860,7 @@ dependencies = [ "pprof", "proptest", "proptest-arbitrary-interop", - "proptest-derive", + "proptest-derive 0.5.0", "rand 0.8.5", "reth-codecs", "reth-primitives", @@ -7096,7 +7107,7 @@ dependencies = [ "pin-project", "proptest", "proptest-arbitrary-interop", - "proptest-derive", + "proptest-derive 0.5.0", "rand 0.8.5", "reth-chainspec", "reth-codecs", @@ -7129,7 +7140,7 @@ dependencies = [ "derive_more", "proptest", "proptest-arbitrary-interop", - "proptest-derive", + "proptest-derive 0.5.0", "rand 0.8.5", "reth-chainspec", "reth-codecs-derive", @@ -7176,7 +7187,7 @@ dependencies = [ "arbitrary", "crc", "proptest", - "proptest-derive", + "proptest-derive 0.5.0", "serde", "thiserror-no-std", ] @@ -7912,7 +7923,7 @@ dependencies = [ "pprof", "proptest", "proptest-arbitrary-interop", - "proptest-derive", + "proptest-derive 0.5.0", "rand 0.8.5", "rayon", "reth-chainspec", @@ -7951,7 +7962,7 @@ dependencies = [ "modular-bitfield", "proptest", "proptest-arbitrary-interop", - "proptest-derive", + "proptest-derive 0.5.0", "rand 0.8.5", "reth-codecs", "revm-primitives", @@ -8044,7 +8055,7 @@ dependencies = [ "modular-bitfield", "proptest", "proptest-arbitrary-interop", - "proptest-derive", + "proptest-derive 0.5.0", "reth-codecs", "serde", "serde_json", @@ -8277,7 +8288,7 @@ dependencies = [ "bytes", "jsonrpsee-types", "proptest", - "proptest-derive", + "proptest-derive 0.5.0", "rand 0.8.5", "serde", "serde_json", @@ -8380,7 +8391,7 @@ dependencies = [ "modular-bitfield", "proptest", "proptest-arbitrary-interop", - "proptest-derive", + "proptest-derive 0.5.0", "rand 0.8.5", "reth-codecs", "reth-trie-common", @@ -8587,7 +8598,7 @@ dependencies = [ "plain_hasher", "proptest", "proptest-arbitrary-interop", - "proptest-derive", + "proptest-derive 0.5.0", "reth-codecs", "reth-primitives-traits", "revm-primitives", diff --git a/Cargo.toml b/Cargo.toml index 5866925dd76a..62770b9deb4c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -501,7 +501,7 @@ tempfile = "3.8" criterion = "0.5" pprof = "0.13" proptest = "1.4" -proptest-derive = "0.4" +proptest-derive = "0.5" serial_test = "3" similar-asserts = "1.5.0" test-fuzz = "5" diff --git a/crates/ethereum-forks/src/lib.rs b/crates/ethereum-forks/src/lib.rs index 1a7e0f56e707..37e9b8710823 100644 --- a/crates/ethereum-forks/src/lib.rs +++ b/crates/ethereum-forks/src/lib.rs @@ -12,8 +12,6 @@ issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/" )] #![cfg_attr(not(test), warn(unused_crate_dependencies))] -// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged -#![allow(unknown_lints, non_local_definitions)] #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] #![cfg_attr(not(feature = "std"), no_std)] diff --git a/crates/net/eth-wire-types/src/lib.rs b/crates/net/eth-wire-types/src/lib.rs index a60fa4c8c1e9..e75898a1ff70 100644 --- a/crates/net/eth-wire-types/src/lib.rs +++ b/crates/net/eth-wire-types/src/lib.rs @@ -6,8 +6,6 @@ issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/" )] #![cfg_attr(not(test), warn(unused_crate_dependencies))] -// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged -#![allow(unknown_lints, non_local_definitions)] #![allow(clippy::needless_lifetimes)] // side effect of optimism fields #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] diff --git a/crates/net/eth-wire/src/lib.rs b/crates/net/eth-wire/src/lib.rs index 3830baa1b7e5..e96a27077f8c 100644 --- a/crates/net/eth-wire/src/lib.rs +++ b/crates/net/eth-wire/src/lib.rs @@ -11,8 +11,6 @@ issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/" )] #![cfg_attr(not(test), warn(unused_crate_dependencies))] -// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged -#![allow(unknown_lints, non_local_definitions)] #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] pub mod capability; diff --git a/crates/net/eth-wire/tests/fuzz_roundtrip.rs b/crates/net/eth-wire/tests/fuzz_roundtrip.rs index f20d0397c2b6..ec55fc448ae0 100644 --- a/crates/net/eth-wire/tests/fuzz_roundtrip.rs +++ b/crates/net/eth-wire/tests/fuzz_roundtrip.rs @@ -1,8 +1,5 @@ //! Round-trip encoding fuzzing for the `eth-wire` crate. -// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged -#![allow(unknown_lints, non_local_definitions)] - use alloy_rlp::{Decodable, Encodable}; use serde::Serialize; use std::fmt::Debug; diff --git a/crates/primitives-traits/src/lib.rs b/crates/primitives-traits/src/lib.rs index 22d4c86a0fda..590e9573dc4c 100644 --- a/crates/primitives-traits/src/lib.rs +++ b/crates/primitives-traits/src/lib.rs @@ -6,8 +6,6 @@ issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/" )] #![cfg_attr(not(test), warn(unused_crate_dependencies))] -// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged -#![allow(unknown_lints, non_local_definitions)] #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] #![cfg_attr(not(feature = "std"), no_std)] diff --git a/crates/primitives/src/lib.rs b/crates/primitives/src/lib.rs index 59fec9702991..35a3ee189308 100644 --- a/crates/primitives/src/lib.rs +++ b/crates/primitives/src/lib.rs @@ -14,8 +14,6 @@ issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/" )] #![cfg_attr(not(test), warn(unused_crate_dependencies))] -// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged -#![allow(unknown_lints, non_local_definitions)] #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] #![cfg_attr(not(feature = "std"), no_std)] diff --git a/crates/prune/types/src/lib.rs b/crates/prune/types/src/lib.rs index 34d74614f2c1..82563010f165 100644 --- a/crates/prune/types/src/lib.rs +++ b/crates/prune/types/src/lib.rs @@ -6,8 +6,6 @@ issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/" )] #![cfg_attr(not(test), warn(unused_crate_dependencies))] -// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged -#![allow(unknown_lints, non_local_definitions)] #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] mod checkpoint; diff --git a/crates/stages/types/src/lib.rs b/crates/stages/types/src/lib.rs index 93106bd886d1..00355b023bc8 100644 --- a/crates/stages/types/src/lib.rs +++ b/crates/stages/types/src/lib.rs @@ -6,8 +6,6 @@ issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/" )] #![cfg_attr(not(test), warn(unused_crate_dependencies))] -// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged -#![allow(unknown_lints, non_local_definitions)] #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] mod id; diff --git a/crates/storage/codecs/src/lib.rs b/crates/storage/codecs/src/lib.rs index b0927a1481cb..bea26090deb1 100644 --- a/crates/storage/codecs/src/lib.rs +++ b/crates/storage/codecs/src/lib.rs @@ -14,8 +14,6 @@ issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/" )] #![cfg_attr(not(test), warn(unused_crate_dependencies))] -// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged -#![allow(unknown_lints, non_local_definitions)] #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] #![cfg_attr(not(feature = "std"), no_std)] diff --git a/crates/storage/db-api/src/lib.rs b/crates/storage/db-api/src/lib.rs index 284321092320..dc7ab0eb4a65 100644 --- a/crates/storage/db-api/src/lib.rs +++ b/crates/storage/db-api/src/lib.rs @@ -58,8 +58,6 @@ )] #![cfg_attr(not(test), warn(unused_crate_dependencies))] #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] -// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged -#![allow(unknown_lints, non_local_definitions)] /// Common types used throughout the abstraction. pub mod common; diff --git a/crates/storage/db/src/tables/mod.rs b/crates/storage/db/src/tables/mod.rs index c968647a982d..af350b74ae82 100644 --- a/crates/storage/db/src/tables/mod.rs +++ b/crates/storage/db/src/tables/mod.rs @@ -11,9 +11,6 @@ //! //! TODO(onbjerg): Find appropriate format for this... -// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged -#![allow(unknown_lints, non_local_definitions)] - pub mod codecs; mod raw; diff --git a/crates/trie/common/src/lib.rs b/crates/trie/common/src/lib.rs index bc3749e6f936..f845c9ca5cd6 100644 --- a/crates/trie/common/src/lib.rs +++ b/crates/trie/common/src/lib.rs @@ -6,8 +6,6 @@ issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/" )] #![cfg_attr(not(test), warn(unused_crate_dependencies))] -// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged -#![allow(unknown_lints, non_local_definitions)] #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] /// The implementation of hash builder.