From a5d89d4dcbe0b67a327a1228794bf90bf99becc1 Mon Sep 17 00:00:00 2001 From: Domica Date: Tue, 22 Sep 2026 07:50:08 +0000 Subject: [PATCH] style: cargo fmt on the workspace after the recent merges cargo fmt --check fails on main for files left behind by the effects expansion (#159) and the advanced export (#143) merges. This brings them onto fmt so the check passes on main and for every branch based on it. --- .../concat-effects/examples/previews.rs | 5 +- src/crates/concat-effects/src/manifest.rs | 74 +++++++++++++++---- src/crates/concat-effects/src/shader.rs | 16 +++- src/crates/concat-host/src/titles.rs | 5 +- src/crates/concat-render/src/gpu/tests.rs | 20 +++-- src/crates/concat-speech/src/chatterbox.rs | 3 +- 6 files changed, 96 insertions(+), 27 deletions(-) diff --git a/src/crates/concat-effects/examples/previews.rs b/src/crates/concat-effects/examples/previews.rs index 2660b834..cc48adbc 100644 --- a/src/crates/concat-effects/examples/previews.rs +++ b/src/crates/concat-effects/examples/previews.rs @@ -50,7 +50,10 @@ fn main() { let mut failed = 0; let kinds = [Kind::Filter, Kind::Effect, Kind::Transition]; - for package in kinds.into_iter().flat_map(|k| Catalogue::builtin().of_kind(k)) { + for package in kinds + .into_iter() + .flat_map(|k| Catalogue::builtin().of_kind(k)) + { let id = package.id(); if !only.is_empty() && !only.iter().any(|want| want == id) { continue; diff --git a/src/crates/concat-effects/src/manifest.rs b/src/crates/concat-effects/src/manifest.rs index f79049f7..9aee1cb5 100644 --- a/src/crates/concat-effects/src/manifest.rs +++ b/src/crates/concat-effects/src/manifest.rs @@ -237,16 +237,64 @@ pub struct Transition { /// export fallback. Validated at load so a typo is a load error, not a /// silent hard cut at export. pub const XFADE_NAMES: &[&str] = &[ - "fade", "fadeblack", "fadewhite", "fadegrays", "fadefast", "fadeslow", - "dissolve", "pixelize", "distance", "radial", "smoothleft", "smoothright", - "smoothup", "smoothdown", "circleopen", "circleclose", "circlecrop", - "rectcrop", "wipeleft", "wiperight", "wipeup", "wipedown", "wipetl", - "wipetr", "wipebl", "wipebr", "slideleft", "slideright", "slideup", - "slidedown", "vertopen", "vertclose", "horzopen", "horzclose", "diagtl", - "diagtr", "diagbl", "diagbr", "hlslice", "hrslice", "vuslice", "vdslice", - "hblur", "squeezeh", "squeezev", "zoomin", "hlwind", "hrwind", "vuwind", - "vdwind", "coverleft", "coverright", "coverup", "coverdown", "revealleft", - "revealright", "revealup", "revealdown", + "fade", + "fadeblack", + "fadewhite", + "fadegrays", + "fadefast", + "fadeslow", + "dissolve", + "pixelize", + "distance", + "radial", + "smoothleft", + "smoothright", + "smoothup", + "smoothdown", + "circleopen", + "circleclose", + "circlecrop", + "rectcrop", + "wipeleft", + "wiperight", + "wipeup", + "wipedown", + "wipetl", + "wipetr", + "wipebl", + "wipebr", + "slideleft", + "slideright", + "slideup", + "slidedown", + "vertopen", + "vertclose", + "horzopen", + "horzclose", + "diagtl", + "diagtr", + "diagbl", + "diagbr", + "hlslice", + "hrslice", + "vuslice", + "vdslice", + "hblur", + "squeezeh", + "squeezev", + "zoomin", + "hlwind", + "hrwind", + "vuwind", + "vdwind", + "coverleft", + "coverright", + "coverup", + "coverdown", + "revealleft", + "revealright", + "revealup", + "revealdown", ]; /// One render pass of a WGSL package. @@ -395,9 +443,9 @@ impl Manifest { return Err(self.invalid("a transition needs a [transition] table")); }; if self.ffmpeg.is_some() || self.wgsl.is_some() { - return Err(self.invalid( - "a transition's backend is [transition], not [ffmpeg] or [wgsl]", - )); + return Err( + self.invalid("a transition's backend is [transition], not [ffmpeg] or [wgsl]") + ); } if let Some(xfade) = &transition.xfade && !XFADE_NAMES.contains(&xfade.as_str()) diff --git a/src/crates/concat-effects/src/shader.rs b/src/crates/concat-effects/src/shader.rs index 2b1d087d..0ad0583b 100644 --- a/src/crates/concat-effects/src/shader.rs +++ b/src/crates/concat-effects/src/shader.rs @@ -857,8 +857,13 @@ impl TransitionShader { /// layout. Every declared parameter must be a field of the struct. pub fn compile(manifest: &Manifest, body: &str) -> Result { let prelude = format!("{TRANSITION_HEAD}{}", grading()); - let (source, slots, span) = - stitch(manifest, body, Entry::Transition, &prelude, TRANSITION_POSTLUDE)?; + let (source, slots, span) = stitch( + manifest, + body, + Entry::Transition, + &prelude, + TRANSITION_POSTLUDE, + )?; Ok(TransitionShader { key: format!("{}@{}", manifest.effect.id, manifest.effect.version), source, @@ -1069,7 +1074,12 @@ fn transition(uv: vec2, progress: f32) -> vec4 { assert!(shader.source().contains("fn fs_main")); assert!(shader.source().contains("frame.progress")); assert!(shader.source().contains("to_texture")); - let pass = shader.pass(&BTreeMap::from([("softness".to_owned(), 0.5)]), &manifest.params, 0.25, None); + let pass = shader.pass( + &BTreeMap::from([("softness".to_owned(), 0.5)]), + &manifest.params, + 0.25, + None, + ); assert_eq!(pass.progress, 0.25); assert_eq!(pass.params.len(), 16); } diff --git a/src/crates/concat-host/src/titles.rs b/src/crates/concat-host/src/titles.rs index e870da23..0f1d7818 100644 --- a/src/crates/concat-host/src/titles.rs +++ b/src/crates/concat-host/src/titles.rs @@ -229,7 +229,10 @@ impl Titles { ); let mut live = self.live.lock().unwrap_or_else(|e| e.into_inner()); let (kept, order) = &mut *live; - if kept.insert(key, (art.clone(), Arc::clone(&frame))).is_none() { + if kept + .insert(key, (art.clone(), Arc::clone(&frame))) + .is_none() + { order.push_back(key); } while order.len() > LIVE_KEPT { diff --git a/src/crates/concat-render/src/gpu/tests.rs b/src/crates/concat-render/src/gpu/tests.rs index 58a148ea..4a62a6fc 100644 --- a/src/crates/concat-render/src/gpu/tests.rs +++ b/src/crates/concat-render/src/gpu/tests.rs @@ -403,8 +403,7 @@ fn output_size_changes_are_handled() { #[test] fn a_pass_reads_its_reveal_map_and_the_identity_everywhere() { let Some(mut gpu) = gpu() else { return }; - let body = - "fn effect(uv: vec2) -> vec4 { let r = reveal_order(uv); return vec4(r, r, r, 1.0); }"; + let body = "fn effect(uv: vec2) -> vec4 { let r = reveal_order(uv); return vec4(r, r, r, 1.0); }"; let map = RevealMap::from_rects(4, 4, &[(0, 0, 2, 4), (2, 0, 2, 4)]); let mut revealed = layer(solid(4, 4, [0, 0, 0, 255])); let mut pass = package("test.reveal", body, "", &[], 1.0); @@ -460,7 +459,9 @@ fn every_shader_package_renders_at_its_defaults() { let source = solid(4, 4, [200, 120, 60, 255]); let catalogue = concat_effects::Catalogue::builtin(); for package in catalogue.packages() { - let Some(shader) = package.shader() else { continue }; + let Some(shader) = package.shader() else { + continue; + }; let values = package.resolve(&Default::default()); let pass = shader.pass( &values, @@ -491,7 +492,11 @@ fn a_pass_reads_its_layers_clip_relative_time() { let mut p = plan(4, 4, vec![timed]); p.time = concat_core::time::Rational::approximate(5.0).expect("a rational"); let out = gpu.render(&p); - assert_eq!(&out.pixels()[..3], &[0, 255, 0], "clip_time should read 3.0"); + assert_eq!( + &out.pixels()[..3], + &[0, 255, 0], + "clip_time should read 3.0" + ); } /// Every packaged transition's pipeline actually creates and runs on the @@ -512,9 +517,10 @@ fn every_packaged_transition_combines_across_its_progress_range() { let pass = catalogue .transition_pass(package.id(), &Default::default(), progress) .unwrap_or_else(|| panic!("{} has no transition pass", package.id())); - gpu.combine(4, 4, 0.0, &red, &blue, &pass).unwrap_or_else(|| { - panic!("{} failed to combine at progress {progress}", package.id()) - }); + gpu.combine(4, 4, 0.0, &red, &blue, &pass) + .unwrap_or_else(|| { + panic!("{} failed to combine at progress {progress}", package.id()) + }); } } } diff --git a/src/crates/concat-speech/src/chatterbox.rs b/src/crates/concat-speech/src/chatterbox.rs index d28ffbd1..22e56d4a 100644 --- a/src/crates/concat-speech/src/chatterbox.rs +++ b/src/crates/concat-speech/src/chatterbox.rs @@ -625,8 +625,7 @@ pub fn bundle_dir(models: &Path) -> PathBuf { mod tests { use super::*; - const UPSTREAM: &str = - "https://huggingface.co/ResembleAI/chatterbox-turbo-ONNX/resolve/main/"; + const UPSTREAM: &str = "https://huggingface.co/ResembleAI/chatterbox-turbo-ONNX/resolve/main/"; #[test] fn the_table_names_nine_distinct_files_with_the_bundle_in_front() {