style(pf-vdisplay): rustfmt under the pinned 1.96.0 toolchain
audit / bun-audit (push) Successful in 12s
windows-drivers / probe-and-proto (push) Successful in 31s
ci / web (push) Successful in 48s
apple / swift (push) Failing after 1m1s
ci / docs-site (push) Successful in 1m2s
decky / build-publish (push) Successful in 21s
windows-drivers / driver-build (push) Successful in 1m35s
windows-host / package (push) Failing after 16s
audit / cargo-audit (push) Successful in 2m46s
docker / build-push (., web/Dockerfile, punktfunk-web) (push) Successful in 9s
docker / build-push (ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Successful in 9s
docker / build-push (ci, ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 10s
docker / build-push (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 8s
release / apple (push) Successful in 3m56s
apple / screenshots (push) Has been skipped
ci / bench (push) Successful in 6m26s
windows-msix / package (arm64, C:\Users\Public\ffmpeg-arm64, --no-default-features, aarch64-pc-windows-msvc, C:\t-a64) (push) Successful in 4m19s
docker / build-push (--build-arg FEDORA_VERSION=44, ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm) (push) Successful in 7m0s
windows-msix / package (x64, C:\Users\Public\ffmpeg, , x86_64-pc-windows-msvc, C:\t) (push) Successful in 4m16s
flatpak / build-publish (push) Failing after 8m9s
docker / deploy-docs (push) Successful in 24s
arch / build-publish (push) Successful in 13m9s
android / android (push) Successful in 13m11s
deb / build-publish (push) Successful in 14m12s
windows / build (aarch64-pc-windows-msvc) (push) Successful in 5m8s
ci / rust (push) Successful in 19m29s
rpm / build-publish (43, bazzite, punktfunk-fedora-rpm) (push) Successful in 14m23s
rpm / build-publish (44, fedora-44, punktfunk-fedora44-rpm) (push) Successful in 13m10s
windows / build (x86_64-pc-windows-msvc) (push) Successful in 6m1s

The W6.2 pf-vdisplay extraction (27a5d8da) committed six spots that the pinned
rustfmt (rust-toolchain.toml = 1.96.0) reformats — a short closure collapse and
chain-call wrapping. No semantic change; makes cargo fmt --all --check green so
the combined push does not land CI red on pre-existing format drift.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-07-17 15:38:12 +02:00
parent 2064c0780c
commit 86d9f49473
5 changed files with 6 additions and 25 deletions
@@ -1397,9 +1397,7 @@ fn spawn(w: u32, h: u32, hz: u32, cmd: Option<&str>, log: &std::path::Path) -> R
.filter(|s| !s.trim().is_empty()) .filter(|s| !s.trim().is_empty())
// Read the env fallback under the shared env lock so it can't race a concurrent session's // Read the env fallback under the shared env lock so it can't race a concurrent session's
// `set_var` of the same key (security-review 2026-06-28 #7). // `set_var` of the same key (security-review 2026-06-28 #7).
.or_else(|| { .or_else(|| crate::with_env_lock(|| std::env::var("PUNKTFUNK_GAMESCOPE_APP").ok()))
crate::with_env_lock(|| std::env::var("PUNKTFUNK_GAMESCOPE_APP").ok())
})
.filter(|s| !s.trim().is_empty()) .filter(|s| !s.trim().is_empty())
.unwrap_or_else(|| "sleep infinity".to_string()); .unwrap_or_else(|| "sleep infinity".to_string());
// Dedicated-launch command shaping (Part B): a Steam URI runs with `-silent` so the game is the // Dedicated-launch command shaping (Part B): a Steam URI runs with `-silent` so the game is the
@@ -133,10 +133,7 @@ impl VirtualDisplay for MutterDisplay {
(mode.width, mode.height), (mode.width, mode.height),
crate::policy::Identity::Shared, crate::policy::Identity::Shared,
); );
let remembered_scale = crate::identity::scales() let remembered_scale = crate::identity::scales().lock().unwrap().get(&scale_key);
.lock()
.unwrap()
.get(&scale_key);
if let Some(scale) = remembered_scale { if let Some(scale) = remembered_scale {
tracing::info!(scale, "mutter: reapplying the client's saved display scale"); tracing::info!(scale, "mutter: reapplying the client's saved display scale");
} }
@@ -532,10 +532,7 @@ impl VirtualDisplayManager {
// (`max_displays` across Active+Lingering+Pinned slots; the identity-slot ceiling of 15 is // (`max_displays` across Active+Lingering+Pinned slots; the identity-slot ceiling of 15 is
// the hard limit behind it) — this is the fail-closed backstop for a session that got past // the hard limit behind it) — this is the fail-closed backstop for a session that got past
// admission anyway. One live slot can never trip it (max_displays >= 1). // admission anyway. One live slot can never trip it (max_displays >= 1).
let max = crate::policy::prefs() let max = crate::policy::prefs().get().effective().max_displays;
.get()
.effective()
.max_displays;
if inner.slots.len() as u32 >= max { if inner.slots.len() as u32 >= max {
anyhow::bail!( anyhow::bail!(
"display budget exhausted: {} display(s) live/kept, max_displays = {max} — freeing \ "display budget exhausted: {} display(s) live/kept, max_displays = {max} — freeing \
@@ -1450,12 +1447,7 @@ impl Drop for MonitorLease {
/// no identity to find any other slot by). Shared by `acquire` and the session setup's /// no identity to find any other slot by). Shared by `acquire` and the session setup's
/// [`VirtualDisplayManager::begin_idd_setup`], so both address the same slot. /// [`VirtualDisplayManager::begin_idd_setup`], so both address the same slot.
pub fn slot_id_for(client_fp: Option<[u8; 32]>, mode: (u32, u32)) -> u32 { pub fn slot_id_for(client_fp: Option<[u8; 32]>, mode: (u32, u32)) -> u32 {
super::identity::resolve_slot( super::identity::resolve_slot(client_fp, mode, crate::policy::Identity::PerClient).unwrap_or(0)
client_fp,
mode,
crate::policy::Identity::PerClient,
)
.unwrap_or(0)
} }
/// The render-GPU pin (backend-neutral): IDD-push — the sole Windows capture path — runs NVENC on the /// The render-GPU pin (backend-neutral): IDD-push — the sole Windows capture path — runs NVENC on the
@@ -41,10 +41,7 @@ pub(super) fn keep_alive_forever() -> bool {
/// physical(s) so the IDD is the sole composited desktop. /// physical(s) so the IDD is the sole composited desktop.
pub(super) fn topology_action() -> crate::policy::Topology { pub(super) fn topology_action() -> crate::policy::Topology {
use crate::policy::Topology; use crate::policy::Topology;
if crate::policy::prefs() if crate::policy::prefs().configured_effective().is_some() {
.configured_effective()
.is_some()
{
return crate::effective_topology(); return crate::effective_topology();
} }
if std::env::var("PUNKTFUNK_NO_ISOLATE").is_ok() { if std::env::var("PUNKTFUNK_NO_ISOLATE").is_ok() {
@@ -217,10 +217,7 @@ unsafe fn set_render_adapter(h: HANDLE, luid: LUID) -> Result<()> {
/// ///
/// # Safety /// # Safety
/// `dev` must be a live pf-vdisplay control handle (see [`super::manager::control_device_handle`]). /// `dev` must be a live pf-vdisplay control handle (see [`super::manager::control_device_handle`]).
pub unsafe fn send_frame_channel( pub unsafe fn send_frame_channel(dev: HANDLE, req: &control::SetFrameChannelRequest) -> Result<()> {
dev: HANDLE,
req: &control::SetFrameChannelRequest,
) -> Result<()> {
let mut none: [u8; 0] = []; let mut none: [u8; 0] = [];
// SAFETY: per this fn's contract `dev` is the live control handle. `bytes_of(req)` borrows the // SAFETY: per this fn's contract `dev` is the live control handle. `bytes_of(req)` borrows the
// caller's request for the duration of this synchronous call as the input bytes; `none` is empty, // caller's request for the duration of this synchronous call as the input bytes; `none` is empty,