From ecdb9b2dc2daca1da31d9a70f03e08b17c7937a1 Mon Sep 17 00:00:00 2001 From: aiongg Date: Sat, 10 Oct 2026 23:52:24 +0000 Subject: [PATCH] Integration: rustfmt after merging #389-#392, indd 8 and 9 --- crates/engine/src/cmd/file.rs | 10 +++++++++- crates/engine/src/cmd/media.rs | 10 +++++++++- crates/idml/src/import.rs | 3 ++- crates/idml/src/tests.rs | 2 +- crates/idml/src/tests/object_styles.rs | 5 ++++- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/crates/engine/src/cmd/file.rs b/crates/engine/src/cmd/file.rs index c1d5da72b..add22efa4 100644 --- a/crates/engine/src/cmd/file.rs +++ b/crates/engine/src/cmd/file.rs @@ -572,7 +572,15 @@ fn place_load(s: &mut Session, p: &Value) -> Result { let aid = s.edit(|d, _| { let fresh = AssetId(d.alloc()); let mime = designcraft_render::image_mime(&bytes).to_string(); - Ok(d.add_asset(Asset { id: fresh, name: name.clone(), mime, link: link.clone(), data: Arc::new(bytes), pixels: Some((pw, ph)), ..Default::default() })) + Ok(d.add_asset(Asset { + id: fresh, + name: name.clone(), + mime, + link: link.clone(), + data: Arc::new(bytes), + pixels: Some((pw, ph)), + ..Default::default() + })) })?; s.loaded = Some((aid, (pw as f64, ph as f64))); s.set_tool("placeGun"); diff --git a/crates/engine/src/cmd/media.rs b/crates/engine/src/cmd/media.rs index 640345f41..4b3b5d5de 100644 --- a/crates/engine/src/cmd/media.rs +++ b/crates/engine/src/cmd/media.rs @@ -94,7 +94,15 @@ pub fn specs() -> Vec { Some(Some((bytes, name, link, px))) => { let fresh = AssetId(d.alloc()); let mime = designcraft_render::image_mime(&bytes).to_string(); - Some(Some(d.add_asset(Asset { id: fresh, name, mime, link, data: Arc::new(bytes), pixels: Some(px), ..Default::default() }))) + Some(Some(d.add_asset(Asset { + id: fresh, + name, + mime, + link, + data: Arc::new(bytes), + pixels: Some(px), + ..Default::default() + }))) } Some(None) => Some(None), None => None, diff --git a/crates/idml/src/import.rs b/crates/idml/src/import.rs index 424870fae..1dfa5a234 100644 --- a/crates/idml/src/import.rs +++ b/crates/idml/src/import.rs @@ -2606,7 +2606,8 @@ impl<'r> Importer<'r> { None => (0.0, 0.0, 0.0, 0.0), }; let size = ((r - l).abs(), (b - t).abs()); - let wrap = if g.get("AppliedObjectStyle").is_some() { self.with_style(g, "TextWrapPreference") } else { g.find("TextWrapPreference").cloned() }; + let wrap = + if g.get("AppliedObjectStyle").is_some() { self.with_style(g, "TextWrapPreference") } else { g.find("TextWrapPreference").cloned() }; let wrap = wrap.map(|w| text_wrap(&w)).unwrap_or_default(); let link = g.find("Link"); let uri = link.and_then(|k| k.get("LinkResourceURI")).map(uri_to_path); diff --git a/crates/idml/src/tests.rs b/crates/idml/src/tests.rs index f03682f98..c53c36661 100644 --- a/crates/idml/src/tests.rs +++ b/crates/idml/src/tests.rs @@ -9,10 +9,10 @@ use super::*; mod assets; mod decorations; +mod object_styles; mod rtl_binding; mod variables; mod wrap; -mod object_styles; fn zip_files(files: &[(&str, &str)]) -> Vec { use zip::write::SimpleFileOptions; diff --git a/crates/idml/src/tests/object_styles.rs b/crates/idml/src/tests/object_styles.rs index 301771bd2..4e7f5ef5d 100644 --- a/crates/idml/src/tests/object_styles.rs +++ b/crates/idml/src/tests/object_styles.rs @@ -212,7 +212,10 @@ fn feathers_come_from_the_object_style_unless_its_category_turns_them_off() { &[ (r#"AppliedObjectStyle="ObjectStyle/Fade""#, ""), (r#"AppliedObjectStyle="ObjectStyle/NoGradient""#, ""), - (r#"AppliedObjectStyle="ObjectStyle/Fade""#, r#""#), + ( + r#"AppliedObjectStyle="ObjectStyle/Fade""#, + r#""#, + ), ], ); let fx: Vec<&designcraft_doc::Effects> = d.spreads[0].items.iter().map(|i| &i.effects).collect();