style: cargo fmt — fix rustfmt drift on main after channel-removal merges#5274
Merged
Conversation
`Quality / Check formatting` CI lane was broken on `main` after the 6-channel-removal PR (#5265) landed: the deletions in that PR shortened several match arms and function signatures enough that rustfmt now wants the re-flowed form, but the PR merged before its own followup fmt commit could land. This commit is the exact rustfmt diff from the failed CI job applied verbatim to main: - `crates/librefang-api/src/routes/channels.rs`: alphabetical sort of `use super::sidecar_describe` vs `use super::skills`; `webhook_route_suffix` match arms collapsed to fewer lines; `secrets_env_keys` read re-indented to the single-call form; `upsert_secret(...).map_err(|e| {…})?` collapsed. - `crates/librefang-api/src/routes/secrets_env.rs`: `parent.join(format!(...))` fits on one line. - `crates/librefang-api/src/routes/sidecar_describe.rs`: `describe_sidecar(command, args)` signature on one line. - `crates/librefang-api/tests/channels_routes_test.rs`: `vec![SidecarSchemaField {...}]` re-formatted to the multi-line `vec![\n Struct { ... },\n]` form rustfmt prefers for single big literals. - `crates/librefang-api/tests/sidecar_describe_test.rs`: `describe_sidecar("python3", &[...]).await` collapsed. - `crates/librefang-channels/src/sidecar.rs`: `build_spawn_env(home, ctx)` and `SidecarTask::new(config, home)` signatures collapsed; the `assert_eq!` chain in the test re-flowed because the new `got.get(...).map(|s| s.as_str())` chain doesn't fit the single-line form inside `assert_eq!(...)`. - `crates/librefang-types/tests/config_default_roundtrip.rs`: re-flow the import list now that `LinkedInConfig` is gone; drop the double blank line after `voice_config_default_roundtrips_*`. No logic changes — pure rustfmt diff.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
`Quality / Check formatting` CI lane is broken on `main` after #5265 (6-channel removal) and the user's parallel 12-channel removal landed. Both PRs' deletions shortened match arms / function signatures enough that rustfmt now wants the re-flowed form, but neither PR's followup fmt commit landed before merge.
This is the exact rustfmt diff from the failed Quality job, applied verbatim:
Test plan
No `cargo fmt` was run locally — the host has no native rust toolchain, but the diffs were copied byte-for-byte from the CI job log. The next CI run on this branch is the authoritative confirmation.