Skip to content

cli: Resolve Rust 1.88 clippy lints and format strings#7089

Merged
steviez merged 15 commits intoanza-xyz:masterfrom
steviez:rust_1.88_cli
Aug 22, 2025
Merged

cli: Resolve Rust 1.88 clippy lints and format strings#7089
steviez merged 15 commits intoanza-xyz:masterfrom
steviez:rust_1.88_cli

Conversation

@steviez
Copy link
Copy Markdown

@steviez steviez commented Jul 22, 2025 •
edited
Loading

Problem

Working towards #6850, broken out from #6854

Summary of Changes

  • Shift some specially crafted strings out + apply rustfmt::skip attribute
  • Run cargo clippy --fix --tests with Rust 1.88.0 set in rust-toolchain.toml
    • These should only be instances of uninlined_format_args
  • Run cargo fmt with format_strings = true set in rustfmt.toml

@steviez
Copy link
Copy Markdown
Author

steviez commented Jul 22, 2025

This one is going to need more scrutiny; will be reviewing myself before asking anyone else to look

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Jul 22, 2025 •
edited
Loading

Codecov Report

❌ Patch coverage is 72.81553% with 56 lines in your changes missing coverage. Please review.
✅ Project coverage is 83.4%. Comparing base (6d40add) to head (9a975cd).
⚠️ Report is 2 commits behind head on master.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #7089   +/-   ##
=======================================
  Coverage    83.4%    83.4%           
=======================================
  Files         814      814           
  Lines      366039   366062   +23     
=======================================
+ Hits       305433   305477   +44     
+ Misses      60606    60585   -21
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

steviez
steviez commented Aug 22, 2025
View reviewed changes
Copy link
Copy Markdown
Author

@steviez steviez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR has a bunch of commits, but all of the manual cleanup was done in individual commits so hopefully easy to follow

Comment thread clap-v3-utils/src/keygen/mnemonic.rs
matches: &ArgMatches,
) -> Result<(String, String), Box<dyn error::Error>> {
#[rustfmt::skip]
const PROMPT: &str =
Copy link
Copy Markdown
Author

@steviez steviez Aug 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I decided to leave this one as is as this is regularly displayed to users; on the other hand the adjustments to FEE_PAYER_ARG are in help messages only

Comment thread cli/src/program.rs
steviez
steviez commented Aug 22, 2025
View reviewed changes
Comment thread cli-output/src/cli_output.rs
@steviez steviez requested a review from brooksprumo August 22, 2025 15:29
brooksprumo
brooksprumo approved these changes Aug 22, 2025
View reviewed changes
Copy link
Copy Markdown

@brooksprumo brooksprumo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

Comment thread clap-v3-utils/src/input_validators.rs
@@ -98,7 +98,9 @@ where
// Return an error if a keypair file cannot be parsed
#[deprecated(
since = "1.18.0",
Copy link
Copy Markdown

@brooksprumo brooksprumo Aug 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lol, deprecated in v1.18! Probably about time we remove them. (Not for this PR though.)

Copy link
Copy Markdown
Author

@steviez steviez Aug 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I was going to start peeling this out but there is still some chain of usage so I did not pursue further

@steviez steviez merged commit bc650cf into anza-xyz:master Aug 22, 2025
43 checks passed
@steviez steviez deleted the rust_1.88_cli branch August 22, 2025 23:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@brooksprumo brooksprumo brooksprumo approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@steviez @codecov-commenter @brooksprumo