rustler relase 0.12.0

hansihe · hansihe · commit e6866a5a76db · 2017-01-20T00:33:16.000+01:00
diff --git a/mix.exs b/mix.exs
@@ -42,6 +42,6 @@ defmodule ExHtml5ever.Mixfile do
   #
   # Type "mix help deps" for more examples and options
   defp deps do
-    [{:rustler, github: "hansihe/Rustler", sparse: "rustler_mix"}]
+    [{:rustler, "~> 0.6"}]
   end
 end
diff --git a/mix.lock b/mix.lock
@@ -1 +1 @@
-%{"rustler": {:git, "https://github.com/hansihe/Rustler.git", "e8ba21e44523cacb3c8af2ef952c1a9ce0f67727", [sparse: "rustler_mix"]}}
+%{"rustler": {:hex, :rustler, "0.6.0", "ba67a5e3d662876f2bf7ef5478bb3be03a7baa40e96950456526fdee29673530", [:mix], []}}
diff --git a/native/html5ever_nif/Cargo.toml b/native/html5ever_nif/Cargo.toml
@@ -9,11 +9,11 @@ path = "src/lib.rs"
 crate-type = ["dylib"]
 
 [build-dependencies]
-rustler_codegen = { git = "https://github.com/hansihe/Rustler" }
+rustler_codegen = "^0.12"
 
 [dependencies]
-rustler = { git = "https://github.com/hansihe/Rustler" }
-rustler_codegen = { git = "https://github.com/hansihe/Rustler" }
+rustler = "^0.12"
+rustler_codegen = "^0.12"
 
 html5ever = "*"
 tendril = "*"
diff --git a/native/html5ever_nif/src/lib.rs b/native/html5ever_nif/src/lib.rs
@@ -12,13 +12,19 @@ use rustler::{
     NifEnv,
     NifTerm,
     NifResult,
+    NifError,
     NifEncoder,
+    NifDecoder,
 };
 use rustler::types::binary::NifBinary;
 use rustler::env::OwnedEnv;
 
 use html5ever::{ QualName };
 use html5ever::rcdom::{ RcDom, Handle, NodeEnum };
+use html5ever::driver::ParseOpts;
+use html5ever::tokenizer::TokenizerOpts;
+use html5ever::tree_builder::TreeBuilderOpts;
+use html5ever::tree_builder::interface::QuirksMode;
 use tendril::{ TendrilSink, StrTendril };
 
 mod atoms {
@@ -27,10 +33,74 @@ mod atoms {
 
         atom ok;
         atom error;
+        atom nil;
         atom nif_panic;
 
         atom doctype;
         atom comment;
+
+        atom error_level;
+        atom discard_bom;
+        atom scripting_enabled;
+        atom iframe_srcdoc;
+        atom drop_doctype;
+
+        atom none;
+        atom some;
+        atom all;
+    }
+}
+
+#[derive(PartialEq, Eq)]
+enum ErrorLevel {
+    None,
+    Some,
+    All,
+}
+impl<'a> NifDecoder<'a> for ErrorLevel {
+    fn decode(term: NifTerm<'a>) -> NifResult<ErrorLevel> {
+        if atoms::none() == term { Ok(ErrorLevel::None) }
+        else if atoms::some() == term { Ok(ErrorLevel::Some) }
+        else if atoms::all() == term { Ok(ErrorLevel::All) }
+        else { Err(NifError::BadArg) }
+    }
+}
+
+fn term_to_configs(term: NifTerm) -> 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,
+            },
+        })
     }
 }
 
@@ -113,8 +183,10 @@ fn parse_async<'a>(env: NifEnv<'a>, args: &Vec<NifTerm<'a>>) -> NifResult<NifTer
 
     let return_pid = env.pid();
 
+    //let config = term_to_configs(args[1]);
+
     POOL.spawn(move || {
-        owned_env.send(return_pid, |inner_env| {
+        owned_env.send_and_clear(&return_pid, |inner_env| {
             // This should not really be done in user code. We (Rustler project)
             // need to find a better abstraction that eliminates this.
             match panic::catch_unwind(|| {

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,6 @@ defmodule ExHtml5ever.Mixfile do`
`42`	`42`	`#`
`43`	`43`	`# Type "mix help deps" for more examples and options`
`44`	`44`	`defp deps do`
`45`		`- [{:rustler, github: "hansihe/Rustler", sparse: "rustler_mix"}]`
	`45`	`+ [{:rustler, "~> 0.6"}]`
`46`	`46`	`end`
`47`	`47`	`end`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-%{"rustler": {:git, "https://github.com/hansihe/Rustler.git", "e8ba21e44523cacb3c8af2ef952c1a9ce0f67727", [sparse: "rustler_mix"]}}`
	`1`	`+%{"rustler": {:hex, :rustler, "0.6.0", "ba67a5e3d662876f2bf7ef5478bb3be03a7baa40e96950456526fdee29673530", [:mix], []}}`