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.
This commit is contained in:
FredApps committed 2026-11-14 13:27:46 +01:00
1 parent f07bf58d5b
commit 11bd7d9c8d
4 files changed
+4 -9

No files matched your search

+1 -3
View File
@@ -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 {
-2
View File
@@ -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};
+1 -3
View File
@@ -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};
+2 -1
View File
@@ -60,7 +60,8 @@ fn docx_parts(parts: &[(&str, &str)]) -> Vec<u8> {
}
if !rels.is_empty() {
w.start_file("word/_rels/document.xml.rels", o).unwrap();
let rels_doc = format!(r#"<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">{}</Relationships>"#, rels.join(""));
let rels_doc =
format!(r#"<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">{}</Relationships>"#, rels.join(""));
w.write_all(rels_doc.as_bytes()).unwrap();
}
w.finish().unwrap().into_inner()