From 11bd7d9c8d8f7af05e28f38ef363e570ee164852 Mon Sep 17 00:00:00 2001 From: FredApps Date: Sat, 14 Nov 2026 13:27:46 +0100 Subject: [PATCH] 2743: correct integrated imports and CI formatting Remove duplicate flate2 imports introduced during integration and apply the three exact rustfmt corrections reported in main migration files. Hosted CI will validate per owner direction. --- crates/idml/src/export/item.rs | 4 +--- crates/pdf/src/default_cmyk.rs | 2 -- crates/textimport/src/docx.rs | 4 +--- crates/textimport/src/docx/tests.rs | 3 ++- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/crates/idml/src/export/item.rs b/crates/idml/src/export/item.rs index bfcc0619c..fd5731133 100644 --- a/crates/idml/src/export/item.rs +++ b/crates/idml/src/export/item.rs @@ -1,7 +1,5 @@ use super::common::{affine_s, bool_s, pct, uid, with_props}; -use super::{ - Affine, ColumnsKind, Content, El, Ex, Item, Node, OBJECT_BUILTINS, PathData, Shape, TextFrameOptions, base64_encode, names, num, pt, -}; +use super::{Affine, ColumnsKind, Content, El, Ex, Item, Node, OBJECT_BUILTINS, PathData, Shape, TextFrameOptions, base64_encode, names, num, pt}; impl<'a> Ex<'a> { pub(super) fn item_el(&mut self, it: &Item, xf: Affine) -> El { diff --git a/crates/pdf/src/default_cmyk.rs b/crates/pdf/src/default_cmyk.rs index 2b2d6f981..972eae853 100644 --- a/crates/pdf/src/default_cmyk.rs +++ b/crates/pdf/src/default_cmyk.rs @@ -8,8 +8,6 @@ use std::collections::{BTreeMap, HashSet}; use std::io::Write; -use flate2::Compression; -use flate2::write::ZlibEncoder; use craft_pdf::syntax::Pdf; use craft_pdf::syntax::content::UntypedIter; use craft_pdf::syntax::object::{Dict, Name, Object, ObjectIdentifier, Stream}; diff --git a/crates/textimport/src/docx.rs b/crates/textimport/src/docx.rs index b59426f25..b7bd274df 100644 --- a/crates/textimport/src/docx.rs +++ b/crates/textimport/src/docx.rs @@ -6,9 +6,7 @@ use std::collections::{HashMap, HashSet}; use craft_wordmodel::Block; use craft_wordmodel::numbering::LevelSuffix; use craft_wordmodel::para::{InlineObject, NoteKind, Paragraph}; -use craft_wordmodel::props::{ - Align as WordAlign, CharProps as WordCharProps, NumRef, ParaProps as WordParaProps, Underline, VertAlign, -}; +use craft_wordmodel::props::{Align as WordAlign, CharProps as WordCharProps, NumRef, ParaProps as WordParaProps, Underline, VertAlign}; use craft_wordmodel::section::NumFormat; use craft_wordmodel::styles::{StyleKind, StyleSheet}; use designcraft_doc::story::{BASIC_PARAGRAPH, NO_CHAR_STYLE}; diff --git a/crates/textimport/src/docx/tests.rs b/crates/textimport/src/docx/tests.rs index c7fb3ff28..d49b2a2cc 100644 --- a/crates/textimport/src/docx/tests.rs +++ b/crates/textimport/src/docx/tests.rs @@ -60,7 +60,8 @@ fn docx_parts(parts: &[(&str, &str)]) -> Vec { } if !rels.is_empty() { w.start_file("word/_rels/document.xml.rels", o).unwrap(); - let rels_doc = format!(r#"{}"#, rels.join("")); + let rels_doc = + format!(r#"{}"#, rels.join("")); w.write_all(rels_doc.as_bytes()).unwrap(); } w.finish().unwrap().into_inner()