Removed Cranky and started using Cargo's lints table

.github/workflows/rust.yml

@@ -34,10 +34,6 @@ jobs:
         uses: baptiste0928/cargo-install@v2
         with:
           crate: cargo-nextest
-      - name: install cranky
-        uses: baptiste0928/cargo-install@v2
-        with:
-          crate: cargo-cranky
       - name: install deny
         uses: baptiste0928/cargo-install@v2
         with:
@@ -46,10 +42,10 @@ jobs:
         run: cargo deny check
       - name: fmt
         run: cargo fmt --all --check
-      - name: cranky (all features)
-        run: cargo cranky --workspace --all-targets --all-features
-      - name: cranky (default features)
-        run: cargo cranky --workspace --exclude tools --all-targets
+      - name: clippy (all features)
+        run: cargo clippy --workspace --all-targets --all-features
+      - name: clippy (default features)
+        run: cargo clippy --workspace --exclude zksync_consensus_tools --all-targets
       - name: build
         run: cargo build --all-targets --locked
       - name: test

docs/style.md

@@ -22,24 +22,6 @@ And then run tests with:
 cargo nextest run
 ```
 
-### Linting
-
-We use a particular tool called `cargo cranky` in order to be able to apply a set of lints to an entire workspace. You
-just need to install it with:
-
-```
-cargo install cargo-cranky
-```
-
-and then you can run it just like you would run clippy:
-
-```
-cargo cranky --all-targets --all-features
-```
-
-Note: There's a [RFC](https://github.com/rust-lang/rfcs/pull/3389) underway to add lints to `Cargo.toml``. But until that
-happens, we are stuck with cranky.
-
 ## Codebase Layout
 
 We want the files to be relatively small in general (lets say, <500 LoC), so feel free to split the module into multiple files

node/Cargo.toml

@@ -21,26 +21,75 @@ authors = ["The Matter Labs Team <[email protected]>"]
 homepage = "https://matter-labs.io/"
 license = "MIT"
 
+[workspace.lints.rust]
+unsafe_code = "forbid"
+noop_method_call = "warn"
+missing_docs = "warn"
+unreachable_pub = "warn"
+unused_qualifications = "warn"
+unused_tuple_struct_fields = "warn"
+
+[workspace.lints.clippy]
+# restriction group
+create_dir = "warn"
+empty_structs_with_brackets = "warn"
+float_arithmetic = "warn"
+missing_docs_in_private_items = "warn"
+non_ascii_literal = "warn"
+partial_pub_fields = "warn"
+print_stdout = "warn"
+string_to_string = "warn"
+suspicious_xor_used_as_pow = "warn"
+try_err = "warn"
+separated_literal_suffix = "warn"
+
+# pedantic group
+bool_to_int_with_if = "warn"
+default_trait_access = "warn"
+if_not_else = "warn"
+manual_assert = "warn"
+manual_instant_elapsed = "warn"
+manual_let_else = "warn"
+manual_ok_or = "warn"
+manual_string_new = "warn"
+match_bool = "warn"
+wildcard_imports = "warn"
+
+# cargo group
+wildcard_dependencies = "warn"
+
+# Produces too many false positives.
+redundant_locals = "allow"
+needless_pass_by_ref_mut = "allow"
+
 [workspace.dependencies]
-zksync_protobuf_build = { path = "libs/protobuf_build" }
-zksync_protobuf = { path = "libs/protobuf" }
-zksync_concurrency = { path = "libs/concurrency" }
+# Crates from this repo.
 zksync_consensus_bft = { path = "actors/bft" }
 zksync_consensus_crypto = { path = "libs/crypto" }
 zksync_consensus_executor = { path = "actors/executor" }
 zksync_consensus_network = { path = "actors/network" }
-zksync_consensus_sync_blocks = { path = "actors/sync_blocks" }
 zksync_consensus_roles = { path = "libs/roles" }
 zksync_consensus_storage = { path = "libs/storage" }
+zksync_consensus_sync_blocks = { path = "actors/sync_blocks" }
 zksync_consensus_tools = { path = "tools" }
 zksync_consensus_utils = { path = "libs/utils" }
 
+# Crates from this repo that might become independent in the future.
+zksync_concurrency = { path = "libs/concurrency" }
+zksync_protobuf = { path = "libs/protobuf" }
+zksync_protobuf_build = { path = "libs/protobuf_build" }
+
+# Crates from Matter Labs.
+pairing = { package = "pairing_ce", git = "https://github.com/matter-labs/pairing.git", rev = "f55393f" }
+vise = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "dd05139b76ab0843443ab3ff730174942c825dae" }
+vise-exporter = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "dd05139b76ab0843443ab3ff730174942c825dae" }
+
+# Crates from third-parties.
 anyhow = "1"
 assert_matches = "1.5.0"
 async-trait = "0.1.71"
 bit-vec = "0.6"
 blst = "0.3.10"
-pairing = { package = "pairing_ce", git = "https://github.com/matter-labs/pairing.git", rev = "f55393f" }
 ff_ce = "0.14.3"
 clap = { version = "4.3.3", features = ["derive"] }
 heck = "0.4.1"
@@ -70,13 +119,9 @@ tempfile = "3"
 test-casing = "0.1.0"
 thiserror = "1.0.40"
 time = "0.3.23"
-# TODO(gprusak): only concurrency crate should depend on tokio.
-# All the other crates should depend on concurrency.
 tokio = { version = "1.34.0", features = ["full"] }
 tracing = { version = "0.1.37", features = ["attributes"] }
 tracing-subscriber = { version = "0.3.16", features = ["env-filter", "fmt"] }
-vise = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "dd05139b76ab0843443ab3ff730174942c825dae" }
-vise-exporter = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "dd05139b76ab0843443ab3ff730174942c825dae" }
 
 # Note that "bench" profile inherits from "release" profile and
 # "test" profile inherits from "dev" profile.

node/actors/bft/Cargo.toml

@@ -6,6 +6,9 @@ authors.workspace = true
 homepage.workspace = true
 license.workspace = true
 
+[lints]
+workspace = true
+
 [dependencies]
 zksync_concurrency.workspace = true
 zksync_consensus_crypto.workspace = true

node/actors/executor/Cargo.toml

@@ -6,6 +6,9 @@ authors.workspace = true
 homepage.workspace = true
 license.workspace = true
 
+[lints]
+workspace = true
+
 [dependencies]
 zksync_concurrency.workspace = true
 zksync_consensus_bft.workspace = true

node/actors/network/Cargo.toml

@@ -6,6 +6,9 @@ authors.workspace = true
 homepage.workspace = true
 license.workspace = true
 
+[lints]
+workspace = true
+
 [dependencies]
 zksync_concurrency.workspace = true
 zksync_consensus_crypto.workspace = true

node/actors/sync_blocks/Cargo.toml

@@ -6,6 +6,9 @@ authors.workspace = true
 homepage.workspace = true
 license.workspace = true
 
+[lints]
+workspace = true
+
 [dependencies]
 zksync_concurrency.workspace = true
 zksync_consensus_network.workspace = true

node/libs/concurrency/Cargo.toml

@@ -6,6 +6,46 @@ authors.workspace = true
 homepage.workspace = true
 license.workspace = true
 
+[lints.rust]
+noop_method_call = "warn"
+missing_docs = "warn"
+unreachable_pub = "warn"
+unused_qualifications = "warn"
+unused_tuple_struct_fields = "warn"
+
+[lints.clippy]
+# restriction group
+create_dir = "warn"
+empty_structs_with_brackets = "warn"
+float_arithmetic = "warn"
+missing_docs_in_private_items = "warn"
+non_ascii_literal = "warn"
+partial_pub_fields = "warn"
+print_stdout = "warn"
+string_to_string = "warn"
+suspicious_xor_used_as_pow = "warn"
+try_err = "warn"
+separated_literal_suffix = "warn"
+
+# pedantic group
+bool_to_int_with_if = "warn"
+default_trait_access = "warn"
+if_not_else = "warn"
+manual_assert = "warn"
+manual_instant_elapsed = "warn"
+manual_let_else = "warn"
+manual_ok_or = "warn"
+manual_string_new = "warn"
+match_bool = "warn"
+wildcard_imports = "warn"
+
+# cargo group
+wildcard_dependencies = "warn"
+
+# Produces too many false positives.
+redundant_locals = "allow"
+needless_pass_by_ref_mut = "allow"
+
 [dependencies]
 anyhow.workspace = true
 once_cell.workspace = true

node/libs/concurrency/src/scope/mod.rs

@@ -31,7 +31,6 @@
 // TODO(gprusak): add more tests
 // TODO(gprusak): add simple useful real-life examples
 // TODO(gprusak): add a style guide on how to use scopes.
-#![allow(unsafe_code)]
 use crate::{ctx, time};
 use std::{
     future::Future,

node/libs/crypto/Cargo.toml

@@ -6,6 +6,9 @@ authors.workspace = true
 homepage.workspace = true
 license.workspace = true
 
+[lints]
+workspace = true
+
 [dependencies]
 anyhow.workspace = true
 blst.workspace = true

node/libs/protobuf/Cargo.toml

@@ -5,9 +5,11 @@ edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
 license.workspace = true
-
 links = "zksync_protobuf_proto"
 
+[lints]
+workspace = true
+
 [[bin]]
 name = "conformance_test"
 

node/libs/protobuf_build/Cargo.toml

@@ -6,6 +6,9 @@ authors.workspace = true
 homepage.workspace = true
 license.workspace = true
 
+[lints]
+workspace = true
+
 [dependencies]
 anyhow.workspace = true
 heck.workspace = true

node/libs/protobuf_build/src/lib.rs

@@ -299,7 +299,7 @@ impl Config {
             .context("prepare_output_dir()")?;
         let output_path = output_dir.join("gen.rs");
         let descriptor_path = output_dir.join("gen.binpb");
-        fs::write(&descriptor_path, &descriptor.encode_to_vec())?;
+        fs::write(&descriptor_path, descriptor.encode_to_vec())?;
 
         if self.is_public {
             let manifest = Manifest {

node/libs/roles/Cargo.toml

@@ -5,9 +5,11 @@ edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
 license.workspace = true
-
 links = "zksync_consensus_roles_proto"
 
+[lints]
+workspace = true
+
 [dependencies]
 zksync_concurrency.workspace = true
 zksync_consensus_crypto.workspace = true

node/libs/storage/Cargo.toml

@@ -6,6 +6,9 @@ authors.workspace = true
 homepage.workspace = true
 license.workspace = true
 
+[lints]
+workspace = true
+
 [dependencies]
 zksync_concurrency.workspace = true
 zksync_consensus_roles.workspace = true

node/libs/utils/Cargo.toml

@@ -6,6 +6,9 @@ authors.workspace = true
 homepage.workspace = true
 license.workspace = true
 
+[lints]
+workspace = true
+
 [dependencies]
 zksync_concurrency.workspace = true
 

node/tools/Cargo.toml

@@ -8,6 +8,9 @@ license.workspace = true
 publish = false
 default-run = "executor"
 
+[lints]
+workspace = true
+
 [dependencies]
 zksync_concurrency.workspace = true
 zksync_consensus_bft.workspace = true