Fix more 1.92 Clippies #1968

iostat · 2025-12-18T15:51:58Z

Description

Addresses the clippy::{large_enum_variants,result_large_err} lints introduced by the 1.92 upgrade. Some enum variants were boxed where it made sense, others we're allowed as the size difference between the largest/second-largest wasn't too big to warrant a larger refactor.

Removes the --allow clippy::{large_enum_variants,result_large_err} from make lint[-beta]

Additionally, the --allow unused was changed to --allow unused_assignments, which is the more specific lint that was triggering #1893. Seeing as that's likely a compiler bug, we're keeping that issue open. However, --allow unused did allow some dead_code to slip through the cracks, so that's been addressed here too.

Related Issue(s)

Closes #1895

Type of Change

Refactoring (no functional changes)
Performance improvement (potentially! some multi-kb structures were moved from stack to heap)

Testing

Code should compile and CI should pass. There are no functional changes in this PR.

Changelog Entry

Fixed: CI: Remove clippy exceptions for large enum/err variants added as part of the Rust 1.92 upgrade

github-actions · 2025-12-18T15:52:18Z

OCaml Reference Validation Results

Repository: https://github.com/MinaProtocol/mina.git
Branch: compatible
Status: ❌ Validation failed

Click to see full validation output

Checking OCaml references against https://github.com/MinaProtocol/mina.git (branch: compatible)
Fetching current commit from compatible...
Current OCaml commit: 831d7a0d622e703e0a61d5a7d1480b70e30531c8

Validating references...
========================
✓ VALID: crates/ledger/src/account/account.rs -> src/lib/mina_base/account.ml L:201-224
  ⚠ STALE COMMIT: fc6be4c58091c761f827c858229c2edf9519e941 (current: 831d7a0d622e703e0a61d5a7d1480b70e30531c8)
❌ INVALID: crates/ledger/src/scan_state/transaction_logic/for_tests.rs
   Code at L:2285-2285 differs between commit 5da42ccd72e791f164d4d200cf1ce300262873b3 and current branch
   Referenced: https://github.com/MinaProtocol/mina/blob/5da42ccd72e791f164d4d200cf1ce300262873b3/src/lib/transaction_logic/mina_transaction_logic.ml#L2285-L2285
   Current:    https://github.com/MinaProtocol/mina/blob/compatible/src/lib/transaction_logic/mina_transaction_logic.ml#L2285-L2285
❌ INVALID: crates/ledger/src/scan_state/transaction_logic/for_tests.rs
   Code at L:2351-2356 differs between commit 5da42ccd72e791f164d4d200cf1ce300262873b3 and current branch
   Referenced: https://github.com/MinaProtocol/mina/blob/5da42ccd72e791f164d4d200cf1ce300262873b3/src/lib/transaction_logic/mina_transaction_logic.ml#L2351-L2356
   Current:    https://github.com/MinaProtocol/mina/blob/compatible/src/lib/transaction_logic/mina_transaction_logic.ml#L2351-L2356
❌ INVALID: crates/ledger/src/scan_state/transaction_logic/for_tests.rs
   Code at L:2407 differs between commit 5da42ccd72e791f164d4d200cf1ce300262873b3 and current branch
   Referenced: https://github.com/MinaProtocol/mina/blob/5da42ccd72e791f164d4d200cf1ce300262873b3/src/lib/transaction_logic/mina_transaction_logic.ml#L2407-L2407
   Current:    https://github.com/MinaProtocol/mina/blob/compatible/src/lib/transaction_logic/mina_transaction_logic.ml#L2407-L2407
✓ VALID: crates/ledger/src/scan_state/transaction_logic/mod.rs -> src/lib/mina_base/transaction_status.ml L:9-51
  ⚠ STALE COMMIT: 5da42ccd72e791f164d4d200cf1ce300262873b3 (current: 831d7a0d622e703e0a61d5a7d1480b70e30531c8)
✓ VALID: crates/ledger/src/scan_state/transaction_logic/mod.rs -> src/lib/mina_base/transaction_status.ml L:452-454
  ⚠ STALE COMMIT: 5da42ccd72e791f164d4d200cf1ce300262873b3 (current: 831d7a0d622e703e0a61d5a7d1480b70e30531c8)
✓ VALID: crates/ledger/src/scan_state/transaction_logic/mod.rs -> src/lib/mina_base/with_status.ml L:6-10
  ⚠ STALE COMMIT: 5da42ccd72e791f164d4d200cf1ce300262873b3 (current: 831d7a0d622e703e0a61d5a7d1480b70e30531c8)
✓ VALID: crates/ledger/src/scan_state/transaction_logic/mod.rs -> src/lib/mina_base/fee_transfer.ml L:76-80
  ⚠ STALE COMMIT: 5da42ccd72e791f164d4d200cf1ce300262873b3 (current: 831d7a0d622e703e0a61d5a7d1480b70e30531c8)
✓ VALID: crates/ledger/src/scan_state/transaction_logic/mod.rs -> src/lib/mina_base/fee_transfer.ml L:68-69
  ⚠ STALE COMMIT: 5da42ccd72e791f164d4d200cf1ce300262873b3 (current: 831d7a0d622e703e0a61d5a7d1480b70e30531c8)
✓ VALID: crates/ledger/src/scan_state/transaction_logic/mod.rs -> src/lib/mina_base/coinbase.ml L:17-21
  ⚠ STALE COMMIT: 5da42ccd72e791f164d4d200cf1ce300262873b3 (current: 831d7a0d622e703e0a61d5a7d1480b70e30531c8)
✓ VALID: crates/ledger/src/scan_state/transaction_logic/mod.rs -> src/lib/transaction/transaction.ml L:8-11
  ⚠ STALE COMMIT: 5da42ccd72e791f164d4d200cf1ce300262873b3 (current: 831d7a0d622e703e0a61d5a7d1480b70e30531c8)
✓ VALID: crates/ledger/src/scan_state/transaction_logic/signed_command.rs -> src/lib/mina_base/signed_command_payload.ml L:34-48
  ⚠ STALE COMMIT: 5da42ccd72e791f164d4d200cf1ce300262873b3 (current: 831d7a0d622e703e0a61d5a7d1480b70e30531c8)
✓ VALID: crates/ledger/src/scan_state/transaction_logic/signed_command.rs -> src/lib/mina_base/stake_delegation.ml L:11-13
  ⚠ STALE COMMIT: 5da42ccd72e791f164d4d200cf1ce300262873b3 (current: 831d7a0d622e703e0a61d5a7d1480b70e30531c8)
✓ VALID: crates/ledger/src/scan_state/transaction_logic/signed_command.rs -> src/lib/mina_base/signed_command_payload.ml L:179-181
  ⚠ STALE COMMIT: 5da42ccd72e791f164d4d200cf1ce300262873b3 (current: 831d7a0d622e703e0a61d5a7d1480b70e30531c8)
✓ VALID: crates/ledger/src/scan_state/transaction_logic/signed_command.rs -> src/lib/mina_base/signed_command_payload.ml L:239-243
  ⚠ STALE COMMIT: 5da42ccd72e791f164d4d200cf1ce300262873b3 (current: 831d7a0d622e703e0a61d5a7d1480b70e30531c8)
✓ VALID: crates/ledger/src/scan_state/transaction_logic/signed_command.rs -> src/lib/mina_base/signed_command_payload.ml L:352-362
  ⚠ STALE COMMIT: 5da42ccd72e791f164d4d200cf1ce300262873b3 (current: 831d7a0d622e703e0a61d5a7d1480b70e30531c8)

Summary
=======
Total references found: 16
Valid references: 13
Invalid references: 3
Stale commits: 13

❌ Validation failed: 3 invalid reference(s) found

github-actions · 2025-12-18T15:53:38Z

⚠️ Code Reference Verification Failed

The documentation contains code references that do not match the current state of the codebase on the develop branch.

Issues Found

website/docs/developers/referencing-code-in-documentation.md:36 - File not found: ledger/src/scan_state/transaction_logic/valid.rs

Action Required

The code referenced in the documentation must be merged to develop before documentation can be added/modified.

Please follow this workflow:

Merge the code changes to develop first (this PR or a separate code PR)
Create a follow-up PR with the documentation updates that reference the merged code
The verification will pass once the code is available on develop

See the documentation guidelines for more information about the two-PR workflow.

…tocol messages

…oadSuccess

…py-path variant is the largest

…r instance

richardpringle · 2025-12-18T21:53:57Z

Makefile

-	  --allow clippy::large_enum_variant \
-	  --allow clippy::result-large-err \
-	  --allow unused
+	  --allow unused_assignments


Oh no... for the whole thing!?

(I actually don't know the difference between unused_assignments vs unused)

richardpringle · 2025-12-18T21:55:52Z

crates/ledger/src/proofs/transaction.rs


    /// External worker input.
    #[derive(Debug, BinProtRead, BinProtWrite)]
+    #[expect(clippy::large_enum_variant, reason = "This enum is only used in tests")]


We should put this behind a feature flag if it's only used in tests

Don't need to change in this PR, but can you create an issue before resolving the comment?

richardpringle · 2025-12-18T22:00:31Z

crates/ledger/src/scan_state/scan_state.rs

-                Ok(snark_work::spec::Work::Transition((statement, witness)))
+                Ok(snark_work::spec::Work::Transition((
+                    statement,
+                    Box::new(witness),


Curious to hear your opinion on this, but when it comes to wrapper types like this, I prefer to use witness.into(). That way, changes are minimized if we decide to have any other wrapper or anything like that.

(not a change for this PR, just interested in your thoughts)

richardpringle · 2025-12-18T22:01:14Z

crates/ledger/src/scan_state/snark_work.rs


    /// External worker input.
    #[derive(Debug, BinProtRead, BinProtWrite)]
+    #[expect(clippy::large_enum_variant, reason = "This enum is only used in tests")]


Same comment

richardpringle · 2025-12-18T22:03:34Z

crates/node/src/event_source/event_source_actions.rs

 pub type EventSourceActionWithMeta = redux::ActionWithMeta<EventSourceAction>;

 #[derive(Serialize, Deserialize, Debug, Clone)]
+#[expect(clippy::large_enum_variant, reason = "This enum extends super::Event")]


🤔 I'm not sure if I agree with this one. This should almost certainly be boxed, no?

Also... a nit... but... I would say "wraps," not "extends"

richardpringle · 2025-12-18T22:05:51Z

crates/node/src/ledger/ledger_manager.rs

 /// 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(


richardpringle · 2025-12-18T22:06:54Z

crates/node/src/ledger/ledger_service.rs

            .map(|jobs| {
                let jobs = jobs.collect::<Vec<JobValueWithIndex<'_>>>();
-                let mut iter = jobs.iter().peekable();
+                let iter = jobs.iter().peekable();


richardpringle · 2025-12-18T22:10:58Z

crates/node/src/transition_frontier/genesis/transition_frontier_genesis_reducer.rs

                *state = Self::LedgerLoadSuccess {
                    time: meta.time(),
-                    data: data.clone(),
+                    data: *data.clone(),


Really!? Clone::clone should always return an owned type, no?

Ah nvm... data is &Box

richardpringle · 2025-12-18T22:31:51Z

tools/testing/src/scenario/event_details.rs

+            let rpc_state = &state.p2p.get_ready_peer(peer_id)?.channels.rpc;
+            if *req_id == rpc_state.pending_local_rpc_id()? {
+                return Some(format!("Request: {}", rpc_state.pending_local_rpc()?));
+            }


This is gross... but it was gross before... I just couldn't look at it without commenting

richardpringle · 2025-12-18T22:34:54Z

crates/p2p/src/service_impl/webrtc/mod.rs

github-project-automation bot added this to Rust node Dec 18, 2025

iostat added a commit that referenced this pull request Dec 18, 2025

changelog: add entry for #1968

676b5d2

iostat requested review from dannywillems and richardpringle December 18, 2025 15:52

iostat added a commit that referenced this pull request Dec 18, 2025

changelog: add entry for #1968

4aa73c1

iostat force-pushed the io/1.92-fix-clippies branch from 676b5d2 to 4aa73c1 Compare December 18, 2025 15:55

iostat added a commit that referenced this pull request Dec 18, 2025

changelog: add entry for #1968

2d00bf6

iostat force-pushed the io/1.92-fix-clippies branch from 4aa73c1 to 2d00bf6 Compare December 18, 2025 16:09

iostat added 17 commits December 18, 2025 12:34

build: change unused to unused_assignments, remove large enum exceptions

8822d27

tools/bootstrap-sandbox: remove unused Error enum

8403a8d

cli: remove unused import

d49da27

node: address unused_mut in scan_state_summary

c5b4a2a

ledger: ignore large_enum_variants in tests::ExternalSnarkWorkerRequest

02c5285

p2p/webrtc: address large_enum_variant in PeerCmdAll

f50f4e9

ledger: address large_enum_variant by boxing TxWitness in snark_work

ba9151c

node: allow large_enum_variant for EventSourceAction as it extends Event

3b0a2e3

ledger: Allow large_enum_variant in LedgerRequest as it's storing pro…

7292ed2

…tocol messages

node: box large_enum_variant (6kb!) in RpcSnarkerJobSpecResponse::Ok

1d42af3

node: allow large_enum_variant in state::P2p as it's a redux state

301308f

p2p: box large_enum_variant P2pPeerStatusReady

ac0b3c8

node: box large_enum_variant TransitionFrontierGenesisAction::LedgerL…

8d814e1

…oadSuccess

p2p: allow large_enum_variant P2pChannelsStreamingRpcState as the hap…

b6478e1

…py-path variant is the largest

node,p2p: box large_enum_variant P2pChannelEvent::Received

0f85bf3

node: expect a clippy::result_large_err which is ok in this particula…

5d23d02

…r instance

changelog: add entry for #1968

db82285

iostat force-pushed the io/1.92-fix-clippies branch from 2d00bf6 to db82285 Compare December 18, 2025 17:34

iostat enabled auto-merge December 18, 2025 21:42

richardpringle approved these changes Dec 18, 2025

View reviewed changes

Fix more 1.92 Clippies #1968

Are you sure you want to change the base?

Fix more 1.92 Clippies #1968

Uh oh!

Conversation

iostat commented Dec 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related Issue(s)

Type of Change

Testing

Changelog Entry

Uh oh!

github-actions bot commented Dec 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

OCaml Reference Validation Results

Uh oh!

github-actions bot commented Dec 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚠️ Code Reference Verification Failed

Issues Found

Action Required

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

iostat commented Dec 18, 2025 •

edited

Loading

github-actions bot commented Dec 18, 2025 •

edited

Loading

github-actions bot commented Dec 18, 2025 •

edited

Loading