From 2d3b70fa8e5ecbde89bb037f4c2f88653ae8ac74 Mon Sep 17 00:00:00 2001 From: Dori Medini Date: Thu, 25 Jul 2024 15:23:09 +0300 Subject: [PATCH] fix: clippy fixes for rust 1.80 Signed-off-by: Dori Medini --- Cargo.toml | 11 +++++++++-- crates/blockifier/src/lib.rs | 7 +------ .../updated_skeleton_tree/create_tree_helper.rs | 1 + .../src/component_client/local_component_client.rs | 2 +- crates/native_blockifier/src/lib.rs | 7 +------ 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8d1665c784..1e3a2cea2b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,8 +53,8 @@ ark-ec = "0.4.2" ark-ff = "0.4.0-alpha.7" ark-secp256k1 = "0.4.0" ark-secp256r1 = "0.4.0" -assert_matches = "1.5.0" assert-json-diff = "2.0.2" +assert_matches = "1.5.0" async-recursion = "1.1.0" async-stream = "0.3.3" async-trait = "0.1.79" @@ -176,7 +176,14 @@ zstd = "0.13.1" future-incompatible = "deny" nonstandard-style = "deny" rust-2018-idioms = "deny" -unused = "deny" +# See [here](https://github.com/taiki-e/cargo-llvm-cov/issues/370) for a discussion on why this is +# needed (from rust 1.80). +unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage_nightly)'] } +# Need a priority of `-1` so it is before the `warnings` lint. See +# [here](https://github.com/rust-lang/cargo/issues/12918) for details on the issue, and +# [here](https://rust-lang.github.io/rust-clippy/master/index.html#/lint_groups_priority) for the +# clippy failure this solves. +unused = { level = "deny", priority = -1 } warnings = "deny" [workspace.lints.clippy] diff --git a/crates/blockifier/src/lib.rs b/crates/blockifier/src/lib.rs index 686c46b983..577f2502de 100644 --- a/crates/blockifier/src/lib.rs +++ b/crates/blockifier/src/lib.rs @@ -2,12 +2,7 @@ // length to pointer type ([not necessarily true](https://github.com/rust-lang/rust/issues/65473), // but it is a reasonable assumption for now), this attribute protects against potential overflow // when converting usize to u128. -#![cfg(any( - target_pointer_width = "16", - target_pointer_width = "32", - target_pointer_width = "64", - target_pointer_width = "128" -))] +#![cfg(any(target_pointer_width = "16", target_pointer_width = "32", target_pointer_width = "64",))] #[cfg(feature = "jemalloc")] // Override default allocator. diff --git a/crates/committer/src/patricia_merkle_tree/updated_skeleton_tree/create_tree_helper.rs b/crates/committer/src/patricia_merkle_tree/updated_skeleton_tree/create_tree_helper.rs index 69d3a29dc7..4bf82a4ce0 100644 --- a/crates/committer/src/patricia_merkle_tree/updated_skeleton_tree/create_tree_helper.rs +++ b/crates/committer/src/patricia_merkle_tree/updated_skeleton_tree/create_tree_helper.rs @@ -41,6 +41,7 @@ impl TempSkeletonNode { /// Assumes the nodes are: /// * Descendants of the given index. /// * A non-empty array. +/// /// Note that the if the LCA is the root, the path will be empty (0 length). fn get_path_to_lca( root_index: &NodeIndex, diff --git a/crates/mempool_infra/src/component_client/local_component_client.rs b/crates/mempool_infra/src/component_client/local_component_client.rs index 2330f9fc89..361a6b3e11 100644 --- a/crates/mempool_infra/src/component_client/local_component_client.rs +++ b/crates/mempool_infra/src/component_client/local_component_client.rs @@ -11,7 +11,7 @@ use crate::component_definitions::ComponentRequestAndResponseSender; /// /// # Fields /// - `tx`: An asynchronous sender channel for transmitting -/// `ComponentRequestAndResponseSender` messages. +/// `ComponentRequestAndResponseSender` messages. /// /// # Example /// ```rust diff --git a/crates/native_blockifier/src/lib.rs b/crates/native_blockifier/src/lib.rs index 539b13673f..8ce52197ed 100644 --- a/crates/native_blockifier/src/lib.rs +++ b/crates/native_blockifier/src/lib.rs @@ -1,10 +1,5 @@ // The blockifier crate supports only these specific architectures. -#![cfg(any( - target_pointer_width = "16", - target_pointer_width = "32", - target_pointer_width = "64", - target_pointer_width = "128" -))] +#![cfg(any(target_pointer_width = "16", target_pointer_width = "32", target_pointer_width = "64",))] pub mod errors; pub mod py_block_executor;