Merge pull request #217 from cameleon-rs/dependabot/cargo/roxmltree-0.21.1

Update roxmltree requirement from 0.15.0 to 0.21.1

Author: yawara

genapi/Cargo.toml

@@ -16,7 +16,7 @@ keywords = ["genicam", "camera", "genapi"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-roxmltree = "0.15.0"
+roxmltree = "0.21.1"
 thiserror = "2.0.18"
 string-interner = "0.19.0"
 auto_impl = "1.0.1"

genapi/src/parser/port.rs

@@ -68,7 +68,7 @@ mod tests {
             <Port Name="TestNode">
                 <ChunkID>Fd3219</ChunkID>
                 <SwapEndianess>Yes</SwapEndianess>
-            <Port>
+            </Port>
             "#;
 
         let (node, ..): (PortNode, _, _, _) = parse_default(xml);
@@ -81,7 +81,7 @@ mod tests {
         let xml = r#"
             <Port Name="TestNode">
                 <pChunkID>Fd3219</pChunkID>
-            <Port>
+            </Port>
             "#;
 
         let (node, mut node_builder, ..): (PortNode, _, _, _) = parse_default(xml);
@@ -96,7 +96,7 @@ mod tests {
         let xml = r#"
             <Port Name="TestNode">
                 <CacheChunkData>Yes</CacheChunkData>
-            <Port>
+            </Port>
             "#;
 
         let (node, ..): (PortNode, _, _, _) = parse_default(xml);

genapi/src/parser/xml.rs

@@ -31,7 +31,6 @@ impl<'input> Document<'input> {
 pub(super) struct Node<'a, 'input> {
     inner: roxmltree::Node<'a, 'input>,
     children: Peekable<roxmltree::Children<'a, 'input>>,
-    attributes: Attributes<'a, 'input>,
     src: &'input str,
 }
 
@@ -112,7 +111,7 @@ impl<'a, 'input> Node<'a, 'input> {
     }
 
     pub(super) fn attribute_of(&self, name: &str) -> Option<&str> {
-        self.attributes.attribute_of(name)
+        self.inner.attribute(name)
     }
 
     pub(super) fn text(&self) -> TextView<'a, 'input> {
@@ -122,12 +121,9 @@ impl<'a, 'input> Node<'a, 'input> {
     fn from_xmltree_node(node: roxmltree::Node<'a, 'input>, src: &'input str) -> Self {
         debug_assert!(node.node_type() == roxmltree::NodeType::Element);
         let children = node.children().peekable();
-        let attributes = Attributes::from_xmltree_attrs(node.attributes());
-
         Self {
             inner: node,
             children,
-            attributes,
             src,
         }
     }
@@ -141,26 +137,6 @@ impl fmt::Debug for Node<'_, '_> {
     }
 }
 
-struct Attributes<'a, 'input> {
-    attrs: &'a [roxmltree::Attribute<'input>],
-}
-
-impl<'a, 'input> Attributes<'a, 'input> {
-    fn from_xmltree_attrs(attrs: &'a [roxmltree::Attribute<'input>]) -> Self {
-        Self { attrs }
-    }
-
-    fn attribute_of(&self, name: &str) -> Option<&str> {
-        self.attrs.iter().find_map(|attr| {
-            if attr.name() == name {
-                Some(roxmltree::Attribute::value(attr))
-            } else {
-                None
-            }
-        })
-    }
-}
-
 pub(super) struct TextView<'a, 'input> {
     inner: roxmltree::Node<'a, 'input>,
 }