Skip to content

style: cargo fmt — fix rustfmt drift on main after channel-removal merges#5274

Merged
houko merged 1 commit into
mainfrom
chore/cargo-fmt-after-channel-removals
May 19, 2026
Merged

style: cargo fmt — fix rustfmt drift on main after channel-removal merges#5274
houko merged 1 commit into
mainfrom
chore/cargo-fmt-after-channel-removals

Conversation

@houko

@houko houko commented May 19, 2026

Copy link
Copy Markdown
Contributor

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:

File What rustfmt wants
`librefang-api/src/routes/channels.rs` sort imports; collapse `webhook_route_suffix` arms; re-indent `secrets_env_keys` read; collapse `upsert_secret().map_err()`
`librefang-api/src/routes/secrets_env.rs` `parent.join(format!(...))` on one line
`librefang-api/src/routes/sidecar_describe.rs` `describe_sidecar(cmd, args)` signature on one line
`librefang-api/tests/channels_routes_test.rs` `vec![ Struct {...} ]` → multi-line `vec![\n Struct {...},\n]`
`librefang-api/tests/sidecar_describe_test.rs` collapse `describe_sidecar(...).await`
`librefang-channels/src/sidecar.rs` collapse `build_spawn_env` / `SidecarTask::new` sigs; expand assert chain
`librefang-types/tests/config_default_roundtrip.rs` re-flow import list; drop double blank line

Test plan

  • CI `Quality / Check formatting` goes from ❌ → ✅
  • No other check regresses (pure rustfmt — no logic changes)

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.

`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.
@houko
houko merged commit 900b5d3 into main May 19, 2026
16 checks passed
@houko
houko deleted the chore/cargo-fmt-after-channel-removals branch May 19, 2026 09:58
@github-actions github-actions Bot added the area/channels Messaging channel adapters label May 19, 2026
@github-actions github-actions Bot added the size/M 50-249 lines changed label May 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/channels Messaging channel adapters size/M 50-249 lines changed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant