Skip to content

PdfCraft: An open-source PDF reader and editor written by scratch in pure Rust

refactor(xfa): explicit model imports (Sonar S2208) (#4403)

Dylan M. Taylor9aef0dfb78b2
diff --git a/crates/xfa/src/layout.rs b/crates/xfa/src/layout.rs
index b3d2eb5bf..670d43791 100644
--- a/crates/xfa/src/layout.rs
+++ b/crates/xfa/src/layout.rs
@@ -14,7 +14,10 @@ use base64::Engine;
use crate::XfaError;
use crate::data::{DataNode, data_date_letters, data_path, data_to_iso, date_letters, is_on, iso_to_pattern};
-use crate::model::*;
+use crate::model::{
+ Access, Area, Border, Common, Draw, ExclGroup, Field, Font, HAlign, Layout, Margin, Node, Occur, PageArea, PageRole, Para, Placement, Presence,
+ Rect, Script, SomIndices, Stroke, Subform, Template, Ui, VAlign, Value,
+};
use crate::text::{self, Block, Face, Span};
/// Most pages a form may lay out to.
diff --git a/crates/xfa/src/parse.rs b/crates/xfa/src/parse.rs
index 2b32e5640..838d1730e 100644
--- a/crates/xfa/src/parse.rs
+++ b/crates/xfa/src/parse.rs
@@ -5,7 +5,11 @@ use base64::Engine;
use roxmltree::Node as XmlNode;
use crate::XfaError;
-use crate::model::*;
+use crate::model::{
+ Access, Anchor, Area, Border, Caption, ChoiceList, Color, Common, Corner, Draw, Edge, ExclGroup, Field, FontSpec, HAlign, Layout, Margin, Node,
+ Occur, PageArea, PageRole, PageSet, ParaSpec, Paragraph, Placement, Presence, Rect, RichText, Run, Script, Stroke, Subform, Template, Ui, VAlign,
+ Value,
+};
/// Deepest element nesting followed (templates are shallow; hostile ones are not).
const MAX_DEPTH: usize = 64;
diff --git a/crates/xfa/src/script.rs b/crates/xfa/src/script.rs
index c8d506495..d330c2a64 100644
--- a/crates/xfa/src/script.rs
+++ b/crates/xfa/src/script.rs
@@ -7,7 +7,7 @@ use std::collections::{BTreeMap, HashMap};
use pdfcraft_cos::{Dict, Document, Object, PdfString};
use crate::data::{DataNode, data_path, parse_datasets};
-use crate::model::*;
+use crate::model::{Access, Field, Node, Presence, Script, SomIndices, Template};
use crate::{Report, XfaError};
/// Private key on the AcroForm: presence scripts set, by SOM path.