Skip to content

chore: reformat cargo files to conformant toml syntax#11245

Merged
kskalski merged 1 commit intoanza-xyz:masterfrom
kskalski:ks/chore_sort
Mar 12, 2026
Merged

chore: reformat cargo files to conformant toml syntax#11245
kskalski merged 1 commit intoanza-xyz:masterfrom
kskalski:ks/chore_sort

Conversation

@kskalski
Copy link
Copy Markdown

@kskalski kskalski commented Mar 12, 2026

Problem

Using newer cargo sort forces the syntax in Cargo.toml files to be normalized.

Summary of Changes

Apply re-formatting.

@kskalski kskalski marked this pull request as ready for review March 12, 2026 09:03
@kskalski kskalski requested review from a team as code owners March 12, 2026 09:03
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Mar 12, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 83.2%. Comparing base (630c99b) to head (1b3a7b3).

Additional details and impacted files
@@            Coverage Diff            @@
##           master   #11245     +/-   ##
=========================================
- Coverage    83.2%    83.2%   -0.1%     
=========================================
  Files         841      841             
  Lines      317938   317938             
=========================================
- Hits       264707   264685     -22     
- Misses      53231    53253     +22     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@nagisa
Copy link
Copy Markdown

nagisa commented Mar 12, 2026

While this kinda makes some sense to me, I'm surprised I don't see any code upgrading cargo-sort anywhere nor master CI failing due to ambient upgrade of this tool. At the same time I remember for sure that the CI does run cargo sort --check somewhere...

@kskalski
Copy link
Copy Markdown
Author

Right, at the moment whenever you run sort with newer than typical cargo sort it will re-format / complain about that. I leave it to @yihau to solve the selection and pinning of the right version in all the tooling.
This PR just fixes whatever is broken anyway with those files and is find with all versions.

@yihau
Copy link
Copy Markdown
Member

yihau commented Mar 12, 2026

yeah, for future reference: the motivation comes from #11218. the latest cargo-sort (v2.1.x) appears to sort more things. this change won't cause any issues for users still on v2.0.x btw

@kskalski
Copy link
Copy Markdown
Author

kskalski commented Mar 12, 2026

I guess if we want to require the stricter formatting going forward we could pin the newer version in Dockerfile and rebuild even existing images once this PR is merged.

If there was a way to ensure non-docker/CI scripts use newer version and also enforce stricter formatting, I would like to include it in this PR, but I guess we don't have the machinery for that and adding one seems out of scope.

Regardless of that, if we leave things as is, we will still get stricter formatting as a side effect of switching to Rust 1.94 and anytime new docker images are built.

@yihau
Copy link
Copy Markdown
Member

yihau commented Mar 12, 2026

okay, I just talked with @kskalski. the new plan is that I'll rebuild the rust 1.94 image, which means this PR won't be a blocker 🫡 let's split these two things.

@kskalski kskalski enabled auto-merge March 12, 2026 14:35
@kskalski kskalski added this pull request to the merge queue Mar 12, 2026
Merged via the queue into anza-xyz:master with commit 504522b Mar 12, 2026
62 checks passed
@kskalski kskalski deleted the ks/chore_sort branch March 12, 2026 23:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants