pycadkit 0.3.7__tar.gz → 0.4.0__tar.gz

{pycadkit-0.3.7 → pycadkit-0.4.0}/Cargo.lock

@@ -66,7 +66,7 @@ checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
 [[package]]
 name = "cadkit"
-version = "0.3.7"
+version = "0.4.0"
 dependencies = [
  "cadkit-core",
  "cadkit-dgn",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-capi"
-version = "0.3.7"
+version = "0.4.0"
 dependencies = [
  "cadkit",
  "serde",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-cli"
-version = "0.3.7"
+version = "0.4.0"
 dependencies = [
  "cadkit",
  "clap",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-core"
-version = "0.3.7"
+version = "0.4.0"
 dependencies = [
  "serde",
  "serde_json",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-dgn"
-version = "0.3.7"
+version = "0.4.0"
 dependencies = [
  "cadkit-core",
  "cfb",
@@ -116,7 +116,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-dwg"
-version = "0.3.7"
+version = "0.4.0"
 dependencies = [
  "cadkit-core",
  "cadkit-dxf",
@@ -126,16 +126,28 @@ dependencies = [
 
 [[package]]
 name = "cadkit-dxf"
-version = "0.3.7"
+version = "0.4.0"
 dependencies = [
  "cadkit-core",
  "encoding_rs",
  "serde_json",
 ]
 
+[[package]]
+name = "cadkit-geom"
+version = "0.4.0"
+dependencies = [
+ "i_overlay",
+ "robust",
+ "schemars",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
 [[package]]
 name = "cadkit-gml"
-version = "0.3.7"
+version = "0.4.0"
 dependencies = [
  "cadkit-core",
  "quick-xml",
@@ -145,7 +157,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-py"
-version = "0.3.7"
+version = "0.4.0"
 dependencies = [
  "cadkit",
  "pyo3",
@@ -155,7 +167,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-wasm"
-version = "0.3.7"
+version = "0.4.0"
 dependencies = [
  "cadkit",
  "js-sys",
@@ -236,6 +248,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "dyn-clone"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
+
 [[package]]
 name = "encoding_rs"
 version = "0.8.35"
@@ -291,6 +309,48 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
+[[package]]
+name = "i_float"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ecaff1ce29bcacd72cdf581ba6fce636ef4c4e0b2da7e7846dd0137d98141e2"
+dependencies = [
+ "libm",
+]
+
+[[package]]
+name = "i_key_sort"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c6c58d0c60705e66264ce0f788a69a2f21472aeb8188559e7c8c619dbdc10fa"
+
+[[package]]
+name = "i_overlay"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a518dce2d7cf7e3758159747e7175c8b86ccdcd8d333dfcb7dbeb3eac2e324fc"
+dependencies = [
+ "i_float",
+ "i_key_sort",
+ "i_shape",
+ "i_tree",
+]
+
+[[package]]
+name = "i_shape"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa1878f91ef7921feaf1b2346253ebc5e661878b22d5715195c1d5dcf0f20ae5"
+dependencies = [
+ "i_float",
+]
+
+[[package]]
+name = "i_tree"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180cbc5c4af5d8f57b8096c3cf39efdac3642ece00ca54710db44db3536baed4"
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.2"
@@ -320,6 +380,12 @@ version = "0.2.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
 
+[[package]]
+name = "libm"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
+
 [[package]]
 name = "memchr"
 version = "2.8.3"
@@ -444,12 +510,63 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "ref-cast"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e440fb4e4b4147295338efb76001ab9e4efc0e5839df2c47fc5ac2381d365c3"
+dependencies = [
+ "ref-cast-impl",
+]
+
+[[package]]
+name = "ref-cast-impl"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.6",
+]
+
+[[package]]
+name = "robust"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e27ee8bb91ca0adcf0ecb116293afa12d393f9c2b9b9cd54d33e8078fe19839"
+
 [[package]]
 name = "rustversion"
 version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
 
+[[package]]
+name = "schemars"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab508826f74a77ca9d5aba6ff19b522583ee3eaf28a19384ff3d0e5835fadf6e"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "schemars_derive",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars_derive"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1c3a92094fa7d61aa124645844facb6b554dfc797136d0f5fd1f890e2bffc69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde_derive_internals",
+ "syn 3.0.6",
+]
+
 [[package]]
 name = "serde"
 version = "1.0.229"
@@ -480,6 +597,17 @@ dependencies = [
  "syn 3.0.6",
 ]
 
+[[package]]
+name = "serde_derive_internals"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f852137cce035d6a4df67ccce505ff6b3e9fd3a10e3e52b24dc71e650bb1a9bd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.6",
+]
+
 [[package]]
 name = "serde_json"
 version = "1.0.151"

{pycadkit-0.3.7 → pycadkit-0.4.0}/Cargo.toml

@@ -4,9 +4,9 @@ members = ["crates/*"]
 exclude = ["fuzz"]
 
 [workspace.package]
-version = "0.3.7"
+version = "0.4.0"
 edition = "2024"
-rust-version = "1.85"
+rust-version = "1.88"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/TNYCL/cadkit"
 authors = ["TNYCL"]
@@ -14,12 +14,16 @@ keywords = ["cad", "dwg", "dgn", "dxf", "citygml"]
 categories = ["parser-implementations", "graphics", "encoding", "science::geo"]
 
 [workspace.dependencies]
-cadkit-core = { path = "crates/cadkit-core", version = "0.3.7" }
-cadkit-dgn = { path = "crates/cadkit-dgn", version = "0.3.7", default-features = false }
-cadkit-dwg = { path = "crates/cadkit-dwg", version = "0.3.7" }
-cadkit-dxf = { path = "crates/cadkit-dxf", version = "0.3.7" }
-cadkit-gml = { path = "crates/cadkit-gml", version = "0.3.7" }
-cadkit = { path = "crates/cadkit", version = "0.3.7" }
+cadkit-geom = { path = "crates/cadkit-geom", version = "0.4.0" }
+i_overlay = "=9.0.0"
+robust = "=1.2.0"
+schemars = "1.2.2"
+cadkit-core = { path = "crates/cadkit-core", version = "0.4.0" }
+cadkit-dgn = { path = "crates/cadkit-dgn", version = "0.4.0", default-features = false }
+cadkit-dwg = { path = "crates/cadkit-dwg", version = "0.4.0" }
+cadkit-dxf = { path = "crates/cadkit-dxf", version = "0.4.0" }
+cadkit-gml = { path = "crates/cadkit-gml", version = "0.4.0" }
+cadkit = { path = "crates/cadkit", version = "0.4.0" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 thiserror = "2"

{pycadkit-0.3.7 → pycadkit-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycadkit
-Version: 0.3.7
+Version: 0.4.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research

{pycadkit-0.3.7 → pycadkit-0.4.0}/crates/cadkit-core/src/doc_ops.rs

@@ -875,13 +875,11 @@ fn tessellate_entity_in_place(entity: &mut Entity, tolerance: f64) {
                         out.push(Vertex { bulge: 0.0, ..*a });
                     }
                 }
-                if !*closed {
-                    if let Some(last) = vertices.last() {
-                        out.push(Vertex {
-                            bulge: 0.0,
-                            ..*last
-                        });
-                    }
+                if !*closed && let Some(last) = vertices.last() {
+                    out.push(Vertex {
+                        bulge: 0.0,
+                        ..*last
+                    });
                 }
                 *vertices = out;
             }
@@ -904,10 +902,10 @@ fn flatten_list(
     out: &mut Vec<Entity>,
 ) {
     for mut e in entities {
-        if matches!(e.layer.as_deref(), None | Some("0")) {
-            if let Some(l) = inherited_layer {
-                e.layer = Some(l.to_owned());
-            }
+        if matches!(e.layer.as_deref(), None | Some("0"))
+            && let Some(l) = inherited_layer
+        {
+            e.layer = Some(l.to_owned());
         }
         if e.color == Color::ByBlock && inherited_color != Color::ByBlock {
             e.color = inherited_color;
@@ -956,10 +954,10 @@ fn collect_refs<'a>(
                 if let Some(al) = attr.layer.as_deref() {
                     layers.insert(al);
                 }
-                if let Some(disp) = &attr.display {
-                    if let Some(st) = disp.style.as_deref() {
-                        styles.insert(st);
-                    }
+                if let Some(disp) = &attr.display
+                    && let Some(st) = disp.style.as_deref()
+                {
+                    styles.insert(st);
                 }
             }
             match &e.kind {

{pycadkit-0.3.7 → pycadkit-0.4.0}/crates/cadkit-core/src/geom_ops.rs

@@ -855,10 +855,10 @@ pub fn interpolate_fit_points(
         return None;
     }
     let is_loop = if closed {
-        if let (Some(&first), Some(&last)) = (pts.first(), pts.last()) {
-            if first.distance_to(last) > 1e-12 {
-                pts.push(first);
-            }
+        if let (Some(&first), Some(&last)) = (pts.first(), pts.last())
+            && first.distance_to(last) > 1e-12
+        {
+            pts.push(first);
         }
         pts.len() >= 4
     } else {

{pycadkit-0.3.7 → pycadkit-0.4.0}/crates/cadkit-core/src/model.rs

@@ -132,10 +132,10 @@ impl Document {
             while let Some(items) = stack.pop() {
                 total = total.saturating_add(items.len());
                 for e in items {
-                    if let EntityKind::Group { children, .. } = &e.kind {
-                        if !children.is_empty() {
-                            stack.push(children);
-                        }
+                    if let EntityKind::Group { children, .. } = &e.kind
+                        && !children.is_empty()
+                    {
+                        stack.push(children);
                     }
                 }
             }

{pycadkit-0.3.7 → pycadkit-0.4.0}/crates/cadkit-core/src/ops.rs

@@ -806,10 +806,10 @@ fn extend_polyline(
     let n = vertices.len();
     let segs = if closed { n } else { n.saturating_sub(1) };
     for i in 0..segs {
-        if let (Some(a), Some(b)) = (vertices.get(i), vertices.get((i + 1) % n.max(1))) {
-            if let Some(arc) = segment_arc(a, b, normal, tf) {
-                arc.extend_bbox(bb);
-            }
+        if let (Some(a), Some(b)) = (vertices.get(i), vertices.get((i + 1) % n.max(1)))
+            && let Some(arc) = segment_arc(a, b, normal, tf)
+        {
+            arc.extend_bbox(bb);
         }
     }
 }

{pycadkit-0.3.7 → pycadkit-0.4.0}/crates/cadkit-core/src/polygon.rs

@@ -89,16 +89,15 @@ pub fn validate(
                 charge(work)?;
                 if let (Some(a0), Some(a1), Some(b0), Some(b1)) =
                     (a.first(), a.get(1), b.first(), b.get(1))
-                {
-                    if intersects(
+                    && intersects(
                         project(a0),
                         project(a1),
                         project(b0),
                         project(b1),
                         tolerance,
-                    ) {
-                        return Err(invalid("polygon ring intersects itself"));
-                    }
+                    )
+                {
+                    return Err(invalid("polygon ring intersects itself"));
                 }
             }
         }
@@ -110,16 +109,15 @@ pub fn validate(
                     charge(work)?;
                     if let (Some(a0), Some(a1), Some(b0), Some(b1)) =
                         (ae.first(), ae.get(1), be.first(), be.get(1))
-                    {
-                        if intersects(
+                        && intersects(
                             project(a0),
                             project(a1),
                             project(b0),
                             project(b1),
                             tolerance,
-                        ) {
-                            return Err(invalid("polygon boundaries intersect"));
-                        }
+                        )
+                    {
+                        return Err(invalid("polygon boundaries intersect"));
                     }
                 }
             }
@@ -131,12 +129,11 @@ pub fn validate(
             return Err(invalid("polygon hole is outside exterior"));
         }
         for other in interiors.iter().skip(i + 1) {
-            if let Some(q) = other.first() {
-                if inside(project(p), other, &project, work)?
-                    || inside(project(q), hole, &project, work)?
-                {
-                    return Err(invalid("polygon holes overlap"));
-                }
+            if let Some(q) = other.first()
+                && (inside(project(p), other, &project, work)?
+                    || inside(project(q), hole, &project, work)?)
+            {
+                return Err(invalid("polygon holes overlap"));
             }
         }
     }

{pycadkit-0.3.7 → pycadkit-0.4.0}/crates/cadkit-core/src/svg.rs

@@ -1168,21 +1168,19 @@ impl<'a> Renderer<'a> {
                     .collect();
                 if v.len() >= 2 {
                     pb.polyline(&v, false);
-                    if *arrowhead {
-                        if let (Some(&tip), Some(&from)) = (v.first(), v.get(1)) {
-                            let (dx, dy) = (from.0 - tip.0, from.1 - tip.1);
-                            let seg_len = dx.hypot(dy);
-                            if seg_len > 1e-9 {
-                                let alen = (self.cross * 2.5).min(seg_len * 0.45);
-                                let (ux, uy) = (dx / seg_len, dy / seg_len);
-                                let (px, py) = (-uy, ux);
-                                let hw = alen * 0.35;
-                                let w1 = (tip.0 + ux * alen + px * hw, tip.1 + uy * alen + py * hw);
-                                let w2 = (tip.0 + ux * alen - px * hw, tip.1 + uy * alen - py * hw);
-                                pb.move_to(w1);
-                                pb.line_to(tip);
-                                pb.line_to(w2);
-                            }
+                    if *arrowhead && let (Some(&tip), Some(&from)) = (v.first(), v.get(1)) {
+                        let (dx, dy) = (from.0 - tip.0, from.1 - tip.1);
+                        let seg_len = dx.hypot(dy);
+                        if seg_len > 1e-9 {
+                            let alen = (self.cross * 2.5).min(seg_len * 0.45);
+                            let (ux, uy) = (dx / seg_len, dy / seg_len);
+                            let (px, py) = (-uy, ux);
+                            let hw = alen * 0.35;
+                            let w1 = (tip.0 + ux * alen + px * hw, tip.1 + uy * alen + py * hw);
+                            let w2 = (tip.0 + ux * alen - px * hw, tip.1 + uy * alen - py * hw);
+                            pb.move_to(w1);
+                            pb.line_to(tip);
+                            pb.line_to(w2);
                         }
                     }
                     self.stroke_path(&layer, &pb, e, ctx, color);
@@ -1644,13 +1642,16 @@ fn render_internal(doc: &Document, options: &SvgOptions, include_hidden_layers:
         doc.walk_while(options.model, &walk_opts, visit)
     };
     let mut truncated = stats.truncated;
-    if !truncated && options.expand_blocks && options.text && !doc.blocks.is_empty() {
-        if let Some(m) = doc.models.get(options.model) {
-            let mut stack = Vec::new();
-            r.render_expanded_insert_attributes(&m.entities, &WalkContext::root(), &mut stack, cap);
-            if r.layers.bytes > cap {
-                truncated = true;
-            }
+    if !truncated
+        && options.expand_blocks
+        && options.text
+        && !doc.blocks.is_empty()
+        && let Some(m) = doc.models.get(options.model)
+    {
+        let mut stack = Vec::new();
+        r.render_expanded_insert_attributes(&m.entities, &WalkContext::root(), &mut stack, cap);
+        if r.layers.bytes > cap {
+            truncated = true;
         }
     }
 

{pycadkit-0.3.7 → pycadkit-0.4.0}/crates/cadkit-core/src/text.rs

@@ -436,21 +436,22 @@ pub fn decode_escapes(s: &str, mbcs: &dyn Fn(u8, [u8; 2]) -> Option<String>) ->
                     let low_follows = bytes.get(i + 7) == Some(&b'\\')
                         && matches!(bytes.get(i + 8), Some(b'U' | b'u'))
                         && bytes.get(i + 9) == Some(&b'+');
-                    if let Some(low) = hex4(bytes, i + 10).filter(|_| low_follows) {
-                        if let Some(Ok(c)) = char::decode_utf16([unit as u16, low as u16]).next() {
-                            decoded = Some((c.to_string(), 14));
-                        }
+                    if let Some(low) = hex4(bytes, i + 10).filter(|_| low_follows)
+                        && let Some(Ok(c)) = char::decode_utf16([unit as u16, low as u16]).next()
+                    {
+                        decoded = Some((c.to_string(), 14));
                     }
                 } else if let Some(c) = char::from_u32(unit) {
                     decoded = Some((c.to_string(), 7));
                 }
             }
-        } else if escape && kind == Some(b'M') {
-            if let (Some(n), Some(code)) = (bytes.get(i + 3).copied(), hex4(bytes, i + 4)) {
-                let pair = [(code >> 8) as u8, code as u8];
-                if let Some(text) = mbcs(n, pair).filter(|t| !t.is_empty()) {
-                    decoded = Some((text, 8));
-                }
+        } else if escape
+            && kind == Some(b'M')
+            && let (Some(n), Some(code)) = (bytes.get(i + 3).copied(), hex4(bytes, i + 4))
+        {
+            let pair = [(code >> 8) as u8, code as u8];
+            if let Some(text) = mbcs(n, pair).filter(|t| !t.is_empty()) {
+                decoded = Some((text, 8));
             }
         }
         match decoded {

{pycadkit-0.3.7 → pycadkit-0.4.0}/crates/cadkit-dgn/examples/raster_structure.rs

@@ -86,17 +86,15 @@ fn scan(
                     structure.push(',');
                 }
                 *counts.entry(structure).or_default() += 1;
-                for (off, b) in r.primary().chunks_exact(8).enumerate().skip(4) {
-                    if let Ok(bytes) = <[u8; 8]>::try_from(b) {
-                        if let Some(kind) = kinds.get(&u64::from_le_bytes(bytes)) {
-                            *counts
-                                .entry(format!(
-                                    "type={} possible_id_at={:x} target_type={kind}",
-                                    r.type_code(),
-                                    off * 8
-                                ))
-                                .or_default() += 1;
-                        }
+                for (off, b) in r.primary().as_chunks::<8>().0.iter().enumerate().skip(4) {
+                    if let Some(kind) = kinds.get(&u64::from_le_bytes(*b)) {
+                        *counts
+                            .entry(format!(
+                                "type={} possible_id_at={:x} target_type={kind}",
+                                r.type_code(),
+                                off * 8
+                            ))
+                            .or_default() += 1;
                     }
                 }
             }

{pycadkit-0.3.7 → pycadkit-0.4.0}/crates/cadkit-dgn/src/cfb.rs

@@ -184,8 +184,10 @@ impl<'a> CompoundFile<'a> {
 
         let dir = cf.read_chain(first_dir, None)?;
         let entries: Vec<DirEntry> = dir
-            .chunks_exact(DIR_ENTRY_LEN)
-            .map(parse_dir_entry)
+            .as_chunks::<DIR_ENTRY_LEN>()
+            .0
+            .iter()
+            .map(|entry| parse_dir_entry(entry))
             .collect();
         if entries.first().map(|e| e.kind) != Some(EntryKind::Root) {
             return Err(Error::invalid(
@@ -202,14 +204,17 @@ impl<'a> CompoundFile<'a> {
         if first_mini_fat <= MAX_REGSECT {
             let mf = cf.read_chain(first_mini_fat, None)?;
             cf.mini_fat = mf
-                .chunks_exact(4)
+                .as_chunks::<4>()
+                .0
+                .iter()
                 .filter_map(|c| le::u32_at(c, 0))
                 .collect();
         }
-        if let Some(root) = cf.entries.first().cloned() {
-            if root.start <= MAX_REGSECT && root.size > 0 {
-                cf.mini_stream = cf.read_chain(root.start, Some(root.size))?;
-            }
+        if let Some(root) = cf.entries.first().cloned()
+            && root.start <= MAX_REGSECT
+            && root.size > 0
+        {
+            cf.mini_stream = cf.read_chain(root.start, Some(root.size))?;
         }
         Ok(cf)
     }
@@ -354,10 +359,10 @@ impl<'a> CompoundFile<'a> {
                 })?;
             out.extend_from_slice(sec);
             count += 1;
-            if let Some(s) = size {
-                if out.len() as u64 >= s {
-                    break;
-                }
+            if let Some(s) = size
+                && out.len() as u64 >= s
+            {
+                break;
             }
             sid = self.fat.get(sid as usize).copied().unwrap_or(ENDOFCHAIN);
         }
@@ -431,7 +436,9 @@ fn parse_dir_entry(e: &[u8]) -> DirEntry {
     let units: Vec<u16> = e
         .get(..name_len.saturating_sub(2))
         .unwrap_or(&[])
-        .chunks_exact(2)
+        .as_chunks::<2>()
+        .0
+        .iter()
         .filter_map(|c| le::u16_at(c, 0))
         .collect();
     let kind = match le::u8_at(e, 66).unwrap_or(0) {

{pycadkit-0.3.7 → pycadkit-0.4.0}/crates/cadkit-dgn/src/map/mod.rs

@@ -449,13 +449,13 @@ impl Mapper {
                 bytes: item.raw.to_vec(),
             });
         }
-        if let Some(id) = h.id {
-            if let Some(attrs) = self.pending_tags.remove(&id) {
-                e.attributes = attrs
-                    .into_iter()
-                    .map(|(_, a)| relative_to_owner(a, &e))
-                    .collect();
-            }
+        if let Some(id) = h.id
+            && let Some(attrs) = self.pending_tags.remove(&id)
+        {
+            e.attributes = attrs
+                .into_iter()
+                .map(|(_, a)| relative_to_owner(a, &e))
+                .collect();
         }
         e
     }