Merge pull request #1968 from o1-labs/io/1.92-fix-clippies

Author: iostat

CHANGELOG.md

@@ -36,6 +36,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **Docker compose files**: replace old environment by local in
   docker-compose.block-producer.yml
   ([#1916](https://github.com/o1-labs/mina-rust/pull/1916)
+- **CI**: Remove clippy exceptions for large enum/err variants added
+  as part of the Rust 1.92 upgrade
+  [#1968](https://github.com/o1-labs/mina-rust/pull/1968)
 
 ### Changes
 

Makefile

@@ -262,16 +262,12 @@ format-md: ## Format all markdown and MDX files to wrap at 80 characters
 .PHONY: lint
 lint: ## Run linter (clippy)
 	cargo clippy --all-targets -- -D warnings \
-	  --allow clippy::large_enum_variant \
-	  --allow clippy::result-large-err \
-	  --allow unused
+	  --allow unused_assignments
 
 .PHONY: lint-beta
 lint-beta: ## Run linter (clippy) using beta Rust
 	cargo +beta clippy --all-targets -- -D warnings \
-	  --allow clippy::large_enum_variant \
-	  --allow clippy::result-large-err \
-	  --allow unused
+	  --allow unused_assignments
 
 .PHONY: lint-bash
 lint-bash: ## Check all shell scripts using shellcheck

crates/cli/src/commands/misc.rs

@@ -1,6 +1,5 @@
 use libp2p_identity::PeerId;
 use mina_node::{account::AccountSecretKey, p2p::identity::SecretKey};
-use mina_node_account::AccountPublicKey;
 use std::{fs::File, io::Write};
 
 #[derive(Debug, clap::Args)]

crates/ledger/src/proofs/transaction.rs

@@ -4397,6 +4397,7 @@ pub(super) mod tests {
 
     /// External worker input.
     #[derive(Debug, BinProtRead, BinProtWrite)]
+    #[expect(clippy::large_enum_variant, reason = "This enum is only used in tests")]
     pub enum ExternalSnarkWorkerRequest {
         /// Queries worker for readiness, expected reply is `true`.
         AwaitReadiness,

crates/ledger/src/scan_state/scan_state.rs

@@ -2142,7 +2142,10 @@ impl ScanState {
                     }
                 };
 
-                Ok(snark_work::spec::Work::Transition((statement, witness)))
+                Ok(snark_work::spec::Work::Transition((
+                    statement,
+                    Box::new(witness),
+                )))
             }
             Extracted::Second(s) => {
                 let merged = s.0.statement().merge(&s.1.statement())?;
@@ -2196,7 +2199,10 @@ impl ScanState {
                     }
                 };
 
-                Some(snark_work::spec::Work::Transition((statement, witness)))
+                Some(snark_work::spec::Work::Transition((
+                    statement,
+                    Box::new(witness),
+                )))
             }
             Extracted::Second(s) => {
                 let merged = s.0.statement().merge(&s.1.statement()).unwrap();

crates/ledger/src/scan_state/snark_work.rs

@@ -5,7 +5,7 @@ pub mod spec {
     };
 
     pub enum Work {
-        Transition((Box<Statement<()>>, TransactionWitness)),
+        Transition((Box<Statement<()>>, Box<TransactionWitness>)),
         Merge(Box<(Statement<()>, Box<(LedgerProof, LedgerProof)>)>),
     }
 }
@@ -30,6 +30,7 @@ mod tests {
 
     /// External worker input.
     #[derive(Debug, BinProtRead, BinProtWrite)]
+    #[expect(clippy::large_enum_variant, reason = "This enum is only used in tests")]
     pub enum ExternalSnarkWorkerRequest {
         /// Queries worker for readiness, expected reply is `true`.
         AwaitReadiness,

crates/node/src/event_source/event_source_actions.rs

@@ -3,6 +3,7 @@ use serde::{Deserialize, Serialize};
 pub type EventSourceActionWithMeta = redux::ActionWithMeta<EventSourceAction>;
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
+#[expect(clippy::large_enum_variant, reason = "This enum wraps super::Event")]
 pub enum EventSourceAction {
     /// Notify state machine that the new events might be received/available,
     /// so trigger processing of those events.

crates/node/src/event_source/event_source_effects.rs

@@ -261,10 +261,7 @@ pub fn event_source_effects<S: Service>(store: &mut Store<S>, action: EventSourc
                             store.dispatch(P2pDisconnectionAction::Init { peer_id, reason });
                         }
                         Ok(message) => {
-                            store.dispatch(P2pChannelsMessageReceivedAction {
-                                peer_id,
-                                message: Box::new(message),
-                            });
+                            store.dispatch(P2pChannelsMessageReceivedAction { peer_id, message });
                         }
                     },
                     P2pChannelEvent::Closed(peer_id, chan_id) => {
@@ -489,7 +486,9 @@ pub fn event_source_effects<S: Service>(store: &mut Store<S>, action: EventSourc
             Event::GenesisLoad(res) => match res {
                 Err(err) => todo!("error while trying to load genesis config/ledger. - {err}"),
                 Ok(data) => {
-                    store.dispatch(TransitionFrontierGenesisAction::LedgerLoadSuccess { data });
+                    store.dispatch(TransitionFrontierGenesisAction::LedgerLoadSuccess {
+                        data: Box::new(data),
+                    });
                 }
             },
         },

crates/node/src/ledger/ledger_manager.rs

@@ -22,38 +22,48 @@ use std::collections::BTreeMap;
 /// can't be expressed in the Rust type system at the moment. For this
 /// reason this type is private while functions wrapping the whole call
 /// to the service are exposed as the service's methods.
-#[allow(dead_code)] // TODO
+#[expect(
+    clippy::large_enum_variant,
+    reason = "This is storing large messages, but size difference is only 2x between largest and second-largest variants"
+)]
 pub(super) enum LedgerRequest {
     Write(LedgerWriteRequest),
     Read(LedgerReadId, LedgerReadRequest),
+    /// expected response: `LedgerHash`
     AccountsSet {
         snarked_ledger_hash: LedgerHash,
         parent: LedgerAddress,
         accounts: Vec<MinaBaseAccountBinableArgStableV2>,
-    }, // expected response: LedgerHash
+    },
+    /// expected response: `Vec<Account>`
     AccountsGet {
         ledger_hash: LedgerHash,
         account_ids: Vec<AccountId>,
-    }, // expected response: Vec<Account>
+    },
+    /// expected response: `ChildHashes`
     ChildHashesGet {
         snarked_ledger_hash: LedgerHash,
         parent: LedgerAddress,
-    }, // expected response: ChildHashes
+    },
+    /// expected response: `Success`
     ComputeSnarkedLedgerHashes {
         snarked_ledger_hash: LedgerHash,
-    }, // expected response: Success
+    },
+    /// expected response: `SnarkedLedgerContentsCopied`
     CopySnarkedLedgerContentsForSync {
         origin_snarked_ledger_hash: Vec<LedgerHash>,
         target_snarked_ledger_hash: LedgerHash,
         overwrite: bool,
-    }, // expected response: SnarkedLedgerContentsCopied
+    },
+    /// expected response: `ProducersWithDelegatesMap`
     GetProducersWithDelegates {
         ledger_hash: LedgerHash,
         filter: fn(&CompressedPubKey) -> bool,
-    }, // expected response: ProducersWithDelegatesMap
+    },
+    /// expected response: `LedgerMask`
     GetMask {
         ledger_hash: LedgerHash,
-    }, // expected response: LedgerMask
+    },
     InsertGenesisLedger {
         mask: Mask,
     },

crates/node/src/ledger/ledger_service.rs

@@ -1271,7 +1271,7 @@ impl LedgerCtx {
             .view()
             .map(|jobs| {
                 let jobs = jobs.collect::<Vec<JobValueWithIndex<'_>>>();
-                let mut iter = jobs.iter().peekable();
+                let iter = jobs.iter().peekable();
                 let mut res = Vec::with_capacity(jobs.len());
 
                 for job in iter {