Merge pull request rusterlium#10 from mfeckie/master

hansihe · web-flow · commit 583f63575ef5 · 2018-12-14T21:13:06.000+01:00
Update rustler and address unused code
diff --git a/mix.exs b/mix.exs
@@ -45,7 +45,7 @@ defmodule Html5ever.Mixfile do
   #
   # Type "mix help deps" for more examples and options
   defp deps do
-    [{:rustler, "~> 0.17.0"},
+    [{:rustler, "~> 0.18.0"},
      {:ex_doc, ">= 0.0.0", only: :dev}]
   end
 
diff --git a/mix.lock b/mix.lock
@@ -1,3 +1,5 @@
-%{"earmark": {:hex, :earmark, "1.1.0", "8c2bf85d725050a92042bc1edf362621004d43ca6241c756f39612084e95487f", [:mix], [], "hexpm"},
+%{
+  "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"},
-  "rustler": {:hex, :rustler, "0.17.0", "919c03b77abcf4f6ded2a3433b08829b0ec57b9f382af0ae24e4d1e229a7069e", [: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
@@ -9,8 +9,8 @@ path = "src/lib.rs"
 crate-type = ["dylib"]
 
 [dependencies]
-rustler = "^0.17"
-rustler_codegen = "^0.17"
+rustler = "^0.18"
+rustler_codegen = "^0.18"
 #rustler = { path = "../../../Rustler/" }
 #rustler_codegen = { path = "../../../Rustler/rustler_codegen/" }
 
diff --git a/native/html5ever_nif/src/flat_dom.rs b/native/html5ever_nif/src/flat_dom.rs
@@ -1,6 +1,3 @@
-use ::html5ever;
-use ::markup5ever;
-
 use html5ever::{ QualName, Attribute };
 use html5ever::tree_builder::{ TreeSink, QuirksMode, NodeOrText, ElementFlags };
 use markup5ever::ExpandedName;
@@ -115,11 +112,11 @@ impl TreeSink for FlatSink {
     }
 
     // TODO: Log this or something
-    fn parse_error(&mut self, msg: Cow<'static, str>) {}
-    fn set_quirks_mode(&mut self, mode: QuirksMode) {}
+    fn parse_error(&mut self, _msg: Cow<'static, str>) {}
+    fn set_quirks_mode(&mut self, _mode: QuirksMode) {}
 
     fn get_document(&mut self) -> Self::Handle { NodeHandle(0) }
-    fn get_template_contents(&mut self, target: &Self::Handle) -> Self::Handle {
+    fn get_template_contents(&mut self, _target: &Self::Handle) -> Self::Handle {
         panic!("Templates not supported");
     }
 
diff --git a/native/html5ever_nif/src/lib.rs b/native/html5ever_nif/src/lib.rs
@@ -2,49 +2,36 @@
 extern crate rustler;
 #[macro_use]
 extern crate lazy_static;
-extern crate tendril;
 extern crate scoped_pool;
+extern crate tendril;
 
 extern crate html5ever;
 extern crate markup5ever;
 
 use std::panic;
 
-use rustler::{Env, Term, NifResult, Error, Encoder, Decoder};
-use rustler::types::binary::Binary;
 use rustler::env::OwnedEnv;
+use rustler::types::binary::Binary;
+use rustler::{Decoder, Encoder, Env, Error, NifResult, Term};
 
 use html5ever::rcdom::RcDom;
-use html5ever::driver::ParseOpts;
-use html5ever::tokenizer::TokenizerOpts;
-use html5ever::tree_builder::TreeBuilderOpts;
-use html5ever::tree_builder::QuirksMode;
 use tendril::TendrilSink;
 
-use ::common::{ QNW, STW };
-
 mod common;
-mod rc_dom;
 mod flat_dom;
+mod rc_dom;
 
 mod atoms {
     rustler_atoms! {
         atom html5ever_nif_result;
 
         atom ok;
         atom error;
-        atom nil;
         atom nif_panic;
 
         atom doctype;
         atom comment;
 
-        atom discard_bom;
-        atom scripting_enabled;
-        atom iframe_srcdoc;
-        atom drop_doctype;
-        atom error_level;
-
         atom none;
         atom some;
         atom all;
@@ -71,40 +58,6 @@ impl<'a> Decoder<'a> for ErrorLevel {
     }
 }
 
-fn term_to_configs(term: Term) -> NifResult<ParseOpts> {
-    if atoms::nil() == term {
-        Ok(ParseOpts::default())
-    } else {
-        let env = term.get_env();
-
-        let errors: ErrorLevel = term.map_get(atoms::error_level().to_term(env))?.decode()?;
-
-        let discard_bom: bool = term.map_get(atoms::discard_bom().to_term(env))?.decode()?;
-        let scripting_enabled: bool = term.map_get(atoms::scripting_enabled().to_term(env))?
-            .decode()?;
-        let iframe_srcdoc: bool = term.map_get(atoms::iframe_srcdoc().to_term(env))?.decode()?;
-        let drop_doctype: bool = term.map_get(atoms::drop_doctype().to_term(env))?.decode()?;
-
-        Ok(ParseOpts {
-            tokenizer: TokenizerOpts {
-                exact_errors: errors == ErrorLevel::All,
-                discard_bom: discard_bom,
-                profile: false,
-                initial_state: None,
-                last_start_tag_name: None,
-            },
-            tree_builder: TreeBuilderOpts {
-                exact_errors: errors == ErrorLevel::All,
-                scripting_enabled: scripting_enabled,
-                iframe_srcdoc: iframe_srcdoc,
-                drop_doctype: drop_doctype,
-                ignore_missing_rules: false,
-                quirks_mode: QuirksMode::NoQuirks,
-            },
-        })
-    }
-}
-
 // Thread pool for `parse_async`.
 // TODO: How do we decide on pool size?
 lazy_static! {
@@ -140,7 +93,11 @@ fn parse_async<'a>(env: Env<'a>, args: &[Term<'a>]) -> NifResult<Term<'a>> {
                 let result = parser.one(std::str::from_utf8(binary.as_slice()).unwrap());
 
                 let result_term = rc_dom::handle_to_term(inner_env, &result.document);
-                (atoms::html5ever_nif_result(), atoms::ok(), result_term.unwrap()).encode(inner_env)
+                (
+                    atoms::html5ever_nif_result(),
+                    atoms::ok(),
+                    result_term.unwrap(),
+                ).encode(inner_env)
             }) {
                 Ok(term) => term,
                 Err(err) => {
@@ -174,7 +131,11 @@ fn parse_sync<'a>(env: Env<'a>, args: &[Term<'a>]) -> NifResult<Term<'a>> {
 
     let result_term = rc_dom::handle_to_term(env, &result.document);
 
-    Ok((atoms::html5ever_nif_result(), atoms::ok(), result_term.unwrap()).encode(env))
+    Ok((
+        atoms::html5ever_nif_result(),
+        atoms::ok(),
+        result_term.unwrap(),
+    ).encode(env))
 }
 
 fn flat_parse_sync<'a>(env: Env<'a>, args: &[Term<'a>]) -> NifResult<Term<'a>> {
@@ -192,14 +153,15 @@ fn flat_parse_sync<'a>(env: Env<'a>, args: &[Term<'a>]) -> NifResult<Term<'a>> {
     Ok((atoms::html5ever_nif_result(), atoms::ok(), result_term).encode(env))
 }
 
-rustler_export_nifs!("Elixir.Html5ever.Native",
-                     [
-                         ("parse_async", 1, parse_async),
-                         ("parse_sync", 1, parse_sync),
-                         ("flat_parse_sync", 1, flat_parse_sync)
-                     ],
-                     Some(on_load));
-
+rustler_export_nifs!(
+    "Elixir.Html5ever.Native",
+    [
+        ("parse_async", 1, parse_async),
+        ("parse_sync", 1, parse_sync),
+        ("flat_parse_sync", 1, flat_parse_sync)
+    ],
+    Some(on_load)
+);
 
 fn on_load<'a>(_env: Env<'a>, _load_info: Term<'a>) -> bool {
     true
diff --git a/native/html5ever_nif/src/rc_dom.rs b/native/html5ever_nif/src/rc_dom.rs
@@ -1,7 +1,5 @@
 use ::rustler::{Env, Term, Encoder};
 use ::html5ever::rcdom::{Handle, NodeData};
-use ::html5ever::QualName;
-use ::tendril::StrTendril;
 
 use ::common::{ QNW, STW };
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ defmodule Html5ever.Mixfile do`
`45`	`45`	`#`
`46`	`46`	`# Type "mix help deps" for more examples and options`
`47`	`47`	`defp deps do`
`48`		`- [{:rustler, "~> 0.17.0"},`
	`48`	`+ [{:rustler, "~> 0.18.0"},`
`49`	`49`	`{:ex_doc, ">= 0.0.0", only: :dev}]`
`50`	`50`	`end`
`51`	`51`