build(anvil): cargo-sort --grouped; restore main's grouped dep ordering

Regen from latest cargo-anvil (e2bfe8e), which adds --grouped to the
anvil-cargo-sort recipe. oxidizer-github's own CI sorts with
cargo sort --check --grouped (local-dependency block kept separate from
external deps), while anvil previously sorted without --grouped, which
demands one fully-alphabetical list. Those two orderings are mutually
exclusive, so anvil's earlier "apply cargo-sort" flattening of the root
[workspace.dependencies] diverged from main and produced a textual
Cargo.toml conflict on every rebase (both checks still passed, so no CI
failure -- just merge friction).

With --grouped, anvil's check now accepts main's grouped layout (verified),
so restore the root [workspace.dependencies] to main's exact ordering
(local block then external block; dependency set is byte-identical to main,
only the order changed). Net Cargo.toml diff vs main is now just the
anvil-workspace-lints region -- no dependency reordering.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: martin-kolinek

.anvil.lock

@@ -1,7 +1,7 @@
 version = 1
 tool = "anvil"
 tool_version = "0.1.0"
-catalog_checksum = "sha256:e21fde4692a7e449af76ee33b59e69cb19faec381998858e1d66824f0aa4b808"
+catalog_checksum = "sha256:b79829fd1ae84aefa752f0d98f84964c88e7186b1bc41a15732ad000f81f4035"
 
 [[file]]
 path = ".github/actions/anvil-impact/action.yml"
@@ -61,7 +61,7 @@ checksum = "sha256:a45359b92a6d851fc39bfa1c03aeb489b544ae37a1cea390dbbf860b2def8
 
 [[file]]
 path = "justfiles/anvil/checks.just"
-checksum = "sha256:7b08dd242aeb1e887c9793febe463f0a6c4efcb6ade50d96a0c318aff6b9a9e2"
+checksum = "sha256:7e8024b3bccecc47625911f067ef26bf058988e3f91cc4311a17508c54666a55"
 
 [[file]]
 path = "justfiles/anvil/groups.just"

Cargo.toml

@@ -50,15 +50,51 @@ include = [
 
 [workspace.dependencies]
 
+# local dependencies
+anyspawn = { path = "crates/anyspawn", default-features = false, version = "0.5.5" }
+anyspawn_azure = { path = "crates/anyspawn_azure", default-features = false, version = "0.1.1" }
+bytesbuf = { path = "crates/bytesbuf", default-features = false, version = "0.5.6" }
+bytesbuf_io = { path = "crates/bytesbuf_io", default-features = false, version = "0.5.8" }
+cachet = { path = "crates/cachet", default-features = false, version = "0.7.3" }
+cachet_memory = { path = "crates/cachet_memory", default-features = false, version = "0.3.7" }
+cachet_service = { path = "crates/cachet_service", default-features = false, version = "0.2.8" }
+cachet_tier = { path = "crates/cachet_tier", default-features = false, version = "0.2.6" }
+data_privacy = { path = "crates/data_privacy", default-features = false, version = "0.12.3" }
+data_privacy_core = { path = "crates/data_privacy_core", default-features = false, version = "0.1.2" }
+data_privacy_macros = { path = "crates/data_privacy_macros", default-features = false, version = "0.10.3" }
+data_privacy_macros_impl = { path = "crates/data_privacy_macros_impl", default-features = false, version = "0.10.3" }
+fetch = { path = "crates/fetch", default-features = false, version = "0.12.1" }
+fetch_azure = { path = "crates/fetch_azure", default-features = false, version = "0.2.1" }
+fetch_hyper = { path = "crates/fetch_hyper", default-features = false, version = "0.4.4" }
+fetch_options = { path = "crates/fetch_options", default-features = false, version = "0.2.3" }
+fetch_tls = { path = "crates/fetch_tls", default-features = false, version = "0.2.5" }
+fundle = { path = "crates/fundle", default-features = false, version = "0.3.4" }
+fundle_macros = { path = "crates/fundle_macros", default-features = false, version = "0.3.4" }
+fundle_macros_impl = { path = "crates/fundle_macros_impl", default-features = false, version = "0.3.4" }
+http_extensions = { path = "crates/http_extensions", default-features = false, version = "0.6.4" }
+layered = { path = "crates/layered", default-features = false, version = "0.3.5" }
+multitude = { path = "crates/multitude", default-features = false, version = "0.6.0" }
+ohno = { path = "crates/ohno", default-features = false, version = "0.3.8" }
+ohno_macros = { path = "crates/ohno_macros", default-features = false, version = "0.3.5" }
+plurality = { path = "crates/plurality", default-features = false, version = "0.1.0" }
+recoverable = { path = "crates/recoverable", default-features = false, version = "0.1.7" }
+seatbelt = { path = "crates/seatbelt", default-features = false, version = "0.5.9" }
+seatbelt_http = { path = "crates/seatbelt_http", default-features = false, version = "0.4.4" }
+templated_uri = { path = "crates/templated_uri", default-features = false, version = "0.3.4" }
+templated_uri_macros = { path = "crates/templated_uri_macros", default-features = false, version = "0.2.6" }
+templated_uri_macros_impl = { path = "crates/templated_uri_macros_impl", default-features = false, version = "0.2.6" }
+testing_aids = { path = "crates/testing_aids", default-features = false }
+thread_aware = { path = "crates/thread_aware", default-features = false, version = "0.7.5" }
+thread_aware_macros = { path = "crates/thread_aware_macros", default-features = false, version = "0.7.5" }
+thread_aware_macros_impl = { path = "crates/thread_aware_macros_impl", default-features = false, version = "0.7.4" }
+tick = { path = "crates/tick", default-features = false, version = "0.3.5" }
+uniflight = { path = "crates/uniflight", default-features = false, version = "0.2.5" }
+
 # external dependencies
 ahash = { version = "0.8.4", default-features = false }
 alloc_tracker = { version = "0.6.0", default-features = false }
 allocator-api2 = { version = "0.4.0", default-features = false }
 anyhow = { version = "1.0.100", default-features = false }
-
-# local dependencies
-anyspawn = { path = "crates/anyspawn", default-features = false, version = "0.5.5" }
-anyspawn_azure = { path = "crates/anyspawn_azure", default-features = false, version = "0.1.1" }
 argh = { version = "0.1.13", default-features = false }
 async-once-cell = { version = "0.5.0", default-features = false }
 async-trait = { version = "0.1.89", default-features = false }
@@ -70,36 +106,18 @@ bolero = { version = "0.13.4", default-features = false }
 bumpalo = { version = "3.20.2", default-features = false }
 bytemuck = { version = "1.25.0", default-features = false }
 bytes = { version = "1.11.1", default-features = false }
-bytesbuf = { path = "crates/bytesbuf", default-features = false, version = "0.5.6" }
-bytesbuf_io = { path = "crates/bytesbuf_io", default-features = false, version = "0.5.8" }
-cachet = { path = "crates/cachet", default-features = false, version = "0.7.3" }
-cachet_memory = { path = "crates/cachet_memory", default-features = false, version = "0.3.7" }
-cachet_service = { path = "crates/cachet_service", default-features = false, version = "0.2.8" }
-cachet_tier = { path = "crates/cachet_tier", default-features = false, version = "0.2.6" }
 chrono = { version = "0.4.40", default-features = false }
 chrono-tz = { version = "0.10.4", default-features = false }
 chumsky = { version = "0.13.0", default-features = false }
 criterion = { version = "0.8.1", default-features = false }
 darling = { version = "0.23.0", default-features = false }
 dashmap = { version = "6.1.0", default-features = false }
-data_privacy = { path = "crates/data_privacy", default-features = false, version = "0.12.3" }
-data_privacy_core = { path = "crates/data_privacy_core", default-features = false, version = "0.1.2" }
-data_privacy_macros = { path = "crates/data_privacy_macros", default-features = false, version = "0.10.3" }
-data_privacy_macros_impl = { path = "crates/data_privacy_macros_impl", default-features = false, version = "0.10.3" }
 deadpool = { version = "0.13.0", default-features = false }
 derive_more = { version = "2.0.1", default-features = false }
 duct = { version = "1.1.1", default-features = false }
 dynosaur = { version = "0.3.0", default-features = false }
 fastrand = { version = "2.3.0", default-features = false, features = ["std"] }
-fetch = { path = "crates/fetch", default-features = false, version = "0.12.1" }
-fetch_azure = { path = "crates/fetch_azure", default-features = false, version = "0.2.1" }
-fetch_hyper = { path = "crates/fetch_hyper", default-features = false, version = "0.4.4" }
-fetch_options = { path = "crates/fetch_options", default-features = false, version = "0.2.3" }
-fetch_tls = { path = "crates/fetch_tls", default-features = false, version = "0.2.5" }
 foldhash = { version = "0.2.0", default-features = false }
-fundle = { path = "crates/fundle", default-features = false, version = "0.3.4" }
-fundle_macros = { path = "crates/fundle_macros", default-features = false, version = "0.3.4" }
-fundle_macros_impl = { path = "crates/fundle_macros_impl", default-features = false, version = "0.3.4" }
 futures = { version = "0.3.31", default-features = false }
 futures-channel = { version = "0.3.31", default-features = false }
 futures-core = { version = "0.3.31", default-features = false }
@@ -109,30 +127,25 @@ hashbrown = { version = "0.17.0", default-features = false }
 http = { version = "1.4.1", default-features = false, features = ["std"] }
 http-body = { version = "1.0.1", default-features = false }
 http-body-util = { version = "0.1.3", default-features = false }
-http_extensions = { path = "crates/http_extensions", default-features = false, version = "0.6.4" }
 hyper = { version = "1.10.1", default-features = false }
 hyper-rustls = { version = "0.27.9", default-features = false }
 hyper-tls = { version = "0.6.0", default-features = false }
 hyper-util = { version = "0.1.20", default-features = false }
 infinity_pool = { version = "0.8.1", default-features = false }
 insta = { version = "1.44.1", default-features = false }
 jiff = { version = "0.2.21", default-features = false }
-layered = { path = "crates/layered", default-features = false, version = "0.3.5" }
 libc = { version = "0.2.178", default-features = false }
 loom = { version = "0.7.2", default-features = false }
 many_cpus = { version = "2.1.0", default-features = false }
 mimalloc = { version = "0.1.52", default-features = false }
 mockall = { version = "0.14.0", default-features = false }
 moka = { version = "0.12.14", default-features = false }
-multitude = { path = "crates/multitude", default-features = false, version = "0.6.0" }
 mutants = { version = "0.0.3", default-features = false }
 native-tls = { version = "0.2.18", default-features = false }
 new_zealand = { version = "1.0.4", default-features = false }
 nm = { version = "0.1.21", default-features = false }
 num-traits = { version = "0.2.19", default-features = false }
 object-pool = { version = "0.6.0", default-features = false }
-ohno = { path = "crates/ohno", default-features = false, version = "0.3.8" }
-ohno_macros = { path = "crates/ohno_macros", default-features = false, version = "0.3.5" }
 once_cell = { version = "1.21.3", default-features = false }
 opentelemetry = { version = "0.32.0", default-features = false }
 opentelemetry-semantic-conventions = { version = "0.32.0", default-features = false }
@@ -143,23 +156,19 @@ parking_lot = { version = "0.12.5", default-features = false }
 pct-str = { version = "3.0.1", default-features = false }
 pin-project = { version = "1.1.8", default-features = false }
 pin-project-lite = { version = "0.2.13", default-features = false }
-plurality = { path = "crates/plurality", default-features = false, version = "0.1.0" }
 postcard = { version = "1.1.3", default-features = false, features = ["use-std"] }
 pretty_assertions = { version = "1.4.1", default-features = false }
 prettyplease = { version = "0.2.37", default-features = false }
 proc-macro2 = { version = "1.0.103", default-features = false }
 ptr_meta = { version = "0.3.1", default-features = false }
 quote = { version = "1.0.42", default-features = false }
 rapidhash = { version = "4.1.1", default-features = false }
-recoverable = { path = "crates/recoverable", default-features = false, version = "0.1.7" }
 regex = { version = "1.12.2", default-features = false }
 rstest = { version = "0.26.0", default-features = false }
 rustc-hash = { version = "2.1.0", default-features = false }
 rustls = { version = "0.23.40", default-features = false }
 rustls-pki-types = { version = "1.14.1", default-features = false }
 rustls-platform-verifier = { version = "0.7.0", default-features = false }
-seatbelt = { path = "crates/seatbelt", default-features = false, version = "0.5.9" }
-seatbelt_http = { path = "crates/seatbelt_http", default-features = false, version = "0.4.4" }
 serde = { version = "1.0.228", default-features = false }
 serde_core = { version = "1.0.228", default-features = false }
 serde_json = { version = "1.0.145", default-features = false }
@@ -170,15 +179,7 @@ smallvec = { version = "1.15.1", default-features = false }
 smol = { version = "2.0.0", default-features = false }
 static_assertions = { version = "1.1.0", default-features = false }
 syn = { version = "2.0.111", default-features = false }
-templated_uri = { path = "crates/templated_uri", default-features = false, version = "0.3.4" }
-templated_uri_macros = { path = "crates/templated_uri_macros", default-features = false, version = "0.2.6" }
-templated_uri_macros_impl = { path = "crates/templated_uri_macros_impl", default-features = false, version = "0.2.6" }
-testing_aids = { path = "crates/testing_aids", default-features = false }
 thiserror = { version = "2.0.17", default-features = false }
-thread_aware = { path = "crates/thread_aware", default-features = false, version = "0.7.5" }
-thread_aware_macros = { path = "crates/thread_aware_macros", default-features = false, version = "0.7.5" }
-thread_aware_macros_impl = { path = "crates/thread_aware_macros_impl", default-features = false, version = "0.7.4" }
-tick = { path = "crates/tick", default-features = false, version = "0.3.5" }
 time = { version = "0.3.47", default-features = false }
 tokio = { version = "1.48.0", default-features = false }
 tokio-native-tls = { version = "0.3.1", default-features = false }
@@ -192,15 +193,13 @@ tracing-test = { version = "0.2.6", default-features = false }
 trait-variant = { version = "0.1.2", default-features = false }
 trybuild = { version = "1.0.114", default-features = false }
 typeid = { version = "1.0.3", default-features = false }
-uniflight = { path = "crates/uniflight", default-features = false, version = "0.2.5" }
 uuid = { version = "1.21.0", default-features = false }
 widestring = { version = "1.2.1", default-features = false }
 windows-sys = { version = "0.61.2", default-features = false }
 wiremock = { version = "0.6.5", default-features = false }
 xxhash-rust = { version = "0.8.15", default-features = false }
 zerocopy = { version = "0.8.26", default-features = false }
 
-# >>> anvil-managed: anvil-workspace-lints
 [workspace.lints]
 # Catalog of opinionated lints, in dotted-key form so users can extend the
 # same scope (`[workspace.lints]` or `[lints]`) outside the sentinels.

justfiles/anvil/checks.just

@@ -122,11 +122,16 @@ anvil-clippy: anvil-clippy-validate-prereqs
 # would pass on formatting drift that the pinned version still rejects.
 # The flag exists in 2.0.2 too (where it is a no-op, since that version
 # already errors on formatting), so it is safe across the supported range.
+#
+# `--grouped` keeps the blank lines between groups of key/value pairs
+# (e.g. blank-line-separated dependency blocks) intact, matching
+# oxidizer-github's convention; without it cargo-sort would flag those
+# blank lines as a formatting diff and fail the check.
 [script("pwsh")]
 anvil-cargo-sort: anvil-cargo-sort-validate-prereqs
     $ErrorActionPreference = 'Stop'
     if ($env:ANVIL_INCLUDE_MODIFIED -eq '--skip') { exit 0 }
-    cargo sort --workspace --check --check-format
+    cargo sort --workspace --grouped --check --check-format
     if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 
 # Modified tier.