Fix #3 issue and update rust dependencies

[run test]

Author: awolverp

Cargo.toml

@@ -17,7 +17,7 @@ crate-type = ["cdylib"]
 members = ["treedom", "matching"]
 
 [workspace.package]
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 readme = "README.md"
 license = "MIT"
@@ -34,7 +34,7 @@ panic = "abort"
 strip = "symbols"
 
 [dependencies]
-pyo3 = { version = "0.24", default-features = false, features = [
+pyo3 = { version = "0.25", default-features = false, features = [
     "macros",
     "extension-module",
 ] }
@@ -47,7 +47,7 @@ hashbrown = { version = "0.15", default-features = false, features = [
 ] }
 
 [build-dependencies]
-pyo3-build-config = { version = "0.24", features = ["resolve-config"] }
+pyo3-build-config = { version = "0.25", features = ["resolve-config"] }
 
 [lints.clippy]
 dbg_macro = "warn"

python/markupever/parser.py

@@ -6,7 +6,12 @@
 class Parser:
     __slots__ = ("__raw", "__state")
 
-    def __init__(self, options: typing.Union[_rustlib.HtmlOptions, _rustlib.XmlOptions, typing.Literal["html"], typing.Literal["xml"]] = "html"):
+    def __init__(
+        self,
+        options: typing.Union[
+            _rustlib.HtmlOptions, _rustlib.XmlOptions, typing.Literal["html"], typing.Literal["xml"]
+        ] = "html",
+    ):
         """
         An HTML/XML parser, ready to receive unicode input.
 
@@ -23,7 +28,7 @@ def __init__(self, options: typing.Union[_rustlib.HtmlOptions, _rustlib.XmlOptio
                 options = _rustlib.XmlOptions()
             else:
                 raise ValueError(f"invalid parser options: {options!r}")
-        
+
         self.__raw = _rustlib.Parser(options)
 
         # 0 - processing
@@ -113,7 +118,9 @@ def __repr__(self) -> str:
 
 def parse(
     content: typing.Union[str, bytes],
-    options: typing.Union[_rustlib.HtmlOptions, _rustlib.XmlOptions, typing.Literal["html"], typing.Literal["xml"]] = "html",
+    options: typing.Union[
+        _rustlib.HtmlOptions, _rustlib.XmlOptions, typing.Literal["html"], typing.Literal["xml"]
+    ] = "html",
 ) -> TreeDom:
     """
     Parses HTML or XML content and returns the parsed document tree.
@@ -132,7 +139,9 @@ def parse(
 
 def parse_file(
     path: typing.Union[str, typing.TextIO, typing.BinaryIO],
-    options: typing.Union[_rustlib.HtmlOptions, _rustlib.XmlOptions, typing.Literal["html"], typing.Literal["xml"]] = "html",
+    options: typing.Union[
+        _rustlib.HtmlOptions, _rustlib.XmlOptions, typing.Literal["html"], typing.Literal["xml"]
+    ] = "html",
     *,
     chunk_size: int = 10240,
 ) -> TreeDom:

python/tests/test_dom.py

@@ -477,3 +477,10 @@ def test_serializer():
             case.content, markupever.XmlOptions() if case.is_xml else markupever.HtmlOptions()
         )
         assert dom.serialize(case.indent) == case.expected
+
+
+def test_add_itself():
+    tag = markupever.parse("<p>").root().first_child
+
+    with pytest.raises(RuntimeError):
+        tag.attach(tag)

src/tree.rs

@@ -183,6 +183,12 @@ impl PyTreeDom {
             ));
         }
 
+        if parent.id == child.id {
+            return Err(pyo3::PyErr::new::<pyo3::exceptions::PyRuntimeError, _>(
+                "Cannot append node as a child to itself",
+            ));
+        }
+
         let mut tree = self_.dom.lock();
         let mut parent = tree.get_mut(parent.id).unwrap();
 
@@ -226,6 +232,12 @@ impl PyTreeDom {
             ));
         }
 
+        if parent.id == child.id {
+            return Err(pyo3::PyErr::new::<pyo3::exceptions::PyRuntimeError, _>(
+                "Cannot append node as a child to itself",
+            ));
+        }
+
         let mut tree = self_.dom.lock();
         let mut parent = tree.get_mut(parent.id).unwrap();
 
@@ -269,6 +281,12 @@ impl PyTreeDom {
             ));
         }
 
+        if parent.id == child.id {
+            return Err(pyo3::PyErr::new::<pyo3::exceptions::PyRuntimeError, _>(
+                "Cannot append node as a child to itself",
+            ));
+        }
+
         let mut tree = self_.dom.lock();
         let mut parent = tree.get_mut(parent.id).unwrap();
 
@@ -312,6 +330,12 @@ impl PyTreeDom {
             ));
         }
 
+        if parent.id == child.id {
+            return Err(pyo3::PyErr::new::<pyo3::exceptions::PyRuntimeError, _>(
+                "Cannot append node as a child to itself",
+            ));
+        }
+
         let mut tree = self_.dom.lock();
         let mut parent = tree.get_mut(parent.id).unwrap();
 

treedom/src/dom.rs

@@ -245,7 +245,7 @@ impl<'a> Serializer<'a> {
 
 fn skip_last<T>(mut iter: impl Iterator<Item = T>) -> impl Iterator<Item = T> {
     let last = iter.next();
-    iter.scan(last, |state, item| std::mem::replace(state, Some(item)))
+    iter.scan(last, |state, item| state.replace(item))
 }
 
 impl markup5ever::serialize::Serialize for Serializer<'_> {