Reword pywal references to bread-theme in comments #9
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "fix/pywal-wording"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Closes ECO-34.
main.rs, state.rs, and theme_watch.rs described the per-output palette cache
invalidation as reacting to "pywal regenerating" the palette files.
bread-theme now extracts and writes palettes natively, and pywal is being
removed across the ecosystem. Comment only, no behaviour change.
This is the last of the ECO-34 wording PRs (bread #6, breadbox #10,
breadhelp #3, breadbar #25 also open).
Verified:
cargo buildsucceeds.cargo fmt --checkreports onepre-existing formatting diff in src/state.rs (an unrelated
AuthStatematch arm), left alone to keep this PR scoped to wording.
Review: blocked on CI (wording itself is fine)
The comment rewording in main.rs, state.rs and theme_watch.rs is accurate. But
CI / check (pull_request)failed on744edbe, and I do not merge on red CI.The cause is pre-existing. The workflow runs
cargo fmt --all -- --check, which fails onbreadlock/src/state.rs:251: rustfmt wants"PAM config error: ...".to_string(),joined onto one line. A clean worktree oforigin/mainhas the same single fmt diff, andmain's ownCI / check (push)is red. This PR's edits to state.rs are doc-comment only and do not cause it.Fix the fmt on main in a separate
fix/branch (or, if you prefer, include the one-linecargo fmtfix here), then re-run. It can merge once CI is green.Note:
design/sketch.htmlstill says "pywal" in several places (lines 11, 13, 343, 348, 528-529). It was outside ECO-34's listed scope, so it is not required here.Pushed a
cargo fmt --allcommit fixing the pre-existing formatting diff at src/state.rs:251 (an AuthState match arm this PR does not touch), matching this repo'scargo fmt --all -- --checkCI gate. Whitespace only.Verified: cargo fmt --all -- --check (clean), cargo clippy --workspace --all-targets -- -D warnings, cargo test --workspace --all-targets (53 passed), cargo build --release --locked, all clean.
Second-round review: wording is clean, blocked on CI (not merging)
The diff is fine. The comment rewording in main.rs, state.rs and theme_watch.rs is accurate, and
e4696bcis a formatting-only rustfmt change.The CI failure is in the workflow, not the runner. Run 25 fails after 4 s in the
Install build depsstep, before any cargo command runs:pacman: error: target not found: clippy..forgejo/workflows/ci.yml:21installsrust cargo clippy rustfmtwith pacman onarchlinux:latest. Arch no longer has separateclippy/rustfmtpackages (they ship insiderust), and thecargo/rustfmtnames now prompt for a provider (rust or rustup). main is red the same way (run 21, 2026-09-11), so this is pre-existing. Fix, for a separate issue: install justrust(plus the other build deps) in ci.yml. This PR stays open until the check is green.Round-3: two commits fixing pre-existing CI breakage blocking this PR (both also present on main, unrelated to the wording changes here).
.forgejo/workflows/ci.yml: stopped asking pacman forclippy/rustfmtas separate packages. Current Arch'srustpackage provides both directly (confirmed against the liveextra/rustpackage info:Provides: cargo rustfmt, pluscargo-clippy/clippy-driver/rustfmtall listed as files owned byrust), so the install step was failing outright with "target not found: clippy" before any real build ever ran.clippy::chunks_exact_to_as_chunksnow fires onblit_to_shm'sshm_bytes.chunks_exact_mut(4)inbreadlock/src/render.rs, because the CI container'srustpackage (1.98.1) ships a newer clippy than what had last verified this line. Applied clippy's own suggested fix (as_chunks_mut::<4>()); this line is unchanged onorigin/main, confirming it's pre-existing drift, not something this branch introduced.Verified both fixes against this repo's actual CI container (fresh
archlinux:latest, not just local toolchain, which still has an older clippy that doesn't have the new lint):cargo fmt --all -- --check,cargo clippy --workspace --all-targets -- -D warnings,cargo test --workspace --all-targets(all green, includingrender::tests::blit_swizzles_rgba_to_bgrafor bothbreadlockandbreadlock-preview),cargo build --release --locked.CI on this push was still starting up as of this comment; will confirm once it completes.
Post-merge review of the round-3 commits (
8a7a570,eb54108): fine, one optional follow-upMain (
05574a0) is green (CI / check).clippy/rustfmtfrom the pacman line is correct. Arch'srustpackage ships cargo-clippy and rustfmt. Keepingcargoin the list is harmless, sincerustprovides it.render.rsblit_to_shm,as_chunks_mut::<4>():slice::as_chunks_muthas been stable since Rust 1.88 (June 2025). Every toolchain that builds breadlock is newer: the CIarchlinux:latestcontainer (rust 1.98.x per your note),package.yml(same image), the PKGBUILD'smakedepends=('rust' 'cargo')on rolling Arch, and this workstation's 1.97.1, where I re-rancargo clippy --workspace --all-targets --locked -- -D warningsclean. Behaviour is unchanged: exact 4-byte chunks, the remainder is ignored as before, andrender::tests::blit_swizzles_rgba_to_bgrastill covers the swizzle.rust-version. Addingrust-version = "1.88"to the breadlock, breadlock-ui and breadgreet manifests turns an old-toolchain build into a clear MSRV error instead of an "unstable feature" one.No fix PR needed.