NodeId::new -> From<usize> for NodeId

gosub-io · Oct 1, 2023 · 77ca0b7 · 77ca0b7
1 parent f083187
commit 77ca0b7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/html5_parser/node.rs b/src/html5_parser/node.rs
@@ -42,6 +42,12 @@ impl From<NodeId> for usize {
     }
 }
 
+impl From<usize> for NodeId {
+    fn from(value: usize) -> Self {
+        Self(value)
+    }
+}
+
 impl Default for &NodeId {
     fn default() -> Self {
         &NodeId(0)
@@ -56,10 +62,6 @@ impl NodeId {
         Self(Self::ROOT_NODE)
     }
 
-    pub fn new(id: usize) -> Self {
-        Self(id)
-    }
-
     pub fn is_positive(&self) -> bool {
         self.0 > 0
     }

diff --git a/src/html5_parser/node_arena.rs b/src/html5_parser/node_arena.rs
@@ -122,7 +122,7 @@ mod tests {
         let node = Node::new_element("test", HashMap::new(), HTML_NAMESPACE);
         let id = arena.add_node(node);
         assert_eq!(arena.nodes.len(), 1);
-        assert_eq!(arena.next_id, NodeId::new(1));
+        assert_eq!(arena.next_id, 1.into());
         assert_eq!(id, NodeId::default());
     }
 

diff --git a/src/html5_parser/parser/adoption_agency.rs b/src/html5_parser/parser/adoption_agency.rs
@@ -57,7 +57,7 @@ impl<'a> Html5Parser<'a> {
                         } = temp_node.data
                         {
                             if name == subject && !attributes.is_empty() {
-                                formatting_element_idx = NodeId::new(idx);
+                                formatting_element_idx = idx.into();
                                 formatting_element_id = node_id;
                                 formatting_element_name = String::from(name);
                                 formatting_element_attributes = attributes.clone();
@@ -105,7 +105,7 @@ impl<'a> Html5Parser<'a> {
                     ActiveElement::Node(node_id) => {
                         let node = self.document.get_node_by_id(node_id).unwrap();
                         if node.is_special() {
-                            furthest_block_idx = NodeId::new(idx);
+                            furthest_block_idx = idx.into();
                             furthest_block_id = node_id;
                             furthest_block_children = self
                                 .document

diff --git a/src/html5_parser/parser/mod.rs b/src/html5_parser/parser/mod.rs
@@ -1965,7 +1965,7 @@ impl<'a> Html5Parser<'a> {
                 self.parse_error("body tag not allowed in in body insertion mode");
 
                 if self.open_elements.len() == 1
-                    || open_elements_get!(self, NodeId::new(1)).name != "body"
+                    || open_elements_get!(self, NodeId::root().next()).name != "body"
                 {
                     // ignore token
                     return;