update html5ever version

hansihe · hansihe · commit 8cc23b84d2ab · 2018-12-14T21:36:45.000+01:00
diff --git a/mix.lock b/mix.lock
@@ -1,5 +1,8 @@
 %{
-  "earmark": {:hex, :earmark, "1.1.0", "8c2bf85d725050a92042bc1edf362621004d43ca6241c756f39612084e95487f", [:mix], [], "hexpm"},
-  "ex_doc": {:hex, :ex_doc, "0.14.5", "c0433c8117e948404d93ca69411dd575ec6be39b47802e81ca8d91017a0cf83c", [:mix], [{:earmark, "~> 1.0", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"},
+  "earmark": {:hex, :earmark, "1.3.0", "17f0c38eaafb4800f746b457313af4b2442a8c2405b49c645768680f900be603", [:mix], [], "hexpm"},
+  "ex_doc": {:hex, :ex_doc, "0.19.1", "519bb9c19526ca51d326c060cb1778d4a9056b190086a8c6c115828eaccea6cf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
+  "makeup": {:hex, :makeup, "0.5.6", "da47b331b1fe0a5f0380cc3a6967200eac5e1daaa9c6bff4b0310b3fcc12b98f", [:mix], [{:nimble_parsec, "~> 0.4.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
+  "makeup_elixir": {:hex, :makeup_elixir, "0.10.0", "0f09c2ddf352887a956d84f8f7e702111122ca32fbbc84c2f0569b8b65cbf7fa", [:mix], [{:makeup, "~> 0.5.5", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"},
+  "nimble_parsec": {:hex, :nimble_parsec, "0.4.0", "ee261bb53214943679422be70f1658fff573c5d0b0a1ecd0f18738944f818efe", [:mix], [], "hexpm"},
   "rustler": {:hex, :rustler, "0.18.0", "db4bd0c613d83a1badc31be90ddada6f9821de29e4afd15c53a5da61882e4f2d", [:mix], [], "hexpm"},
 }
diff --git a/native/html5ever_nif/Cargo.toml b/native/html5ever_nif/Cargo.toml
@@ -14,9 +14,9 @@ rustler_codegen = "^0.18"
 #rustler = { path = "../../../Rustler/" }
 #rustler_codegen = { path = "../../../Rustler/rustler_codegen/" }
 
-html5ever = "0.16"
-markup5ever = "0.1"
+html5ever = "0.22"
+markup5ever = "0.7"
 
-tendril = "0.2"
-lazy_static = "0.2"
-scoped-pool = "1"
+tendril = "0.4"
+lazy_static = "1.2"
+scoped-pool = "1.0"
diff --git a/native/html5ever_nif/src/flat_dom.rs b/native/html5ever_nif/src/flat_dom.rs
@@ -157,6 +157,18 @@ impl TreeSink for FlatSink {
         self.node_mut(handle).parent = Some(*parent_id);
     }
 
+    fn append_based_on_parent_node(&mut self,
+                                   element: &Self::Handle,
+                                   prev_element: &Self::Handle,
+                                   child: NodeOrText<Self::Handle>) {
+        let has_parent = self.node(*element).parent.is_some();
+        if has_parent {
+            self.append_before_sibling(element, child);
+        } else {
+            self.append(prev_element, child);
+        }
+    }
+
     fn append_before_sibling(&mut self, sibling: &Self::Handle, new_node: NodeOrText<Self::Handle>) {
         let new_node_handle = node_or_text_to_node(self, new_node);
 
@@ -213,9 +225,9 @@ impl TreeSink for FlatSink {
         panic!("unsupported");
     }
 
-    fn has_parent_node(&self, handle: &Self::Handle) -> bool {
-        self.node(*handle).parent.is_some()
-    }
+    //fn has_parent_node(&self, handle: &Self::Handle) -> bool {
+    //    self.node(*handle).parent.is_some()
+    //}
 
     fn create_pi(&mut self, target: StrTendril, data: StrTendril) -> Self::Handle {
         self.make_node(NodeData::ProcessingInstruction {
