Merge pull request #52 from mischov/chore/update-dependencies

Update Rust and Elixir dependencies and change compatibility

Author: mischov

.github/workflows/tests.yml

@@ -12,15 +12,18 @@ jobs:
       - name: Set up Elixir
         uses: erlef/setup-beam@v1
         with:
-          otp-version: '24.0'
-          elixir-version: '1.12.0'
+          otp-version: '25.0'
+          elixir-version: '1.14.0'
 
       - name: Check formatting
         run: mix format --check-formatted
 
   test-elixir:
     name: Test with OTP ${{ matrix.otp }} and Elixir ${{ matrix.elixir }}
-    runs-on: ubuntu-latest
+    # TODO change this to ubuntu-latest after OTP 23 is deprecated, see
+    # https://github.com/erlef/setup-beam#compatibility-between-operating-system-and-erlangotp
+    # for compatibility
+    runs-on: ubuntu-20.04
 
     env:
       MIX_ENV: test
@@ -29,31 +32,24 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - otp: '21.0'
-            elixir: '1.7.0'
-          - otp: '21.0'
-            elixir: '1.11.0'
-          - otp: '22.0'
-            elixir: '1.7.0'
-          - otp: '22.0'
-            elixir: '1.11.0'
-          - otp: '23.0'
-            elixir: '1.10.3'
           - otp: '23.0'
             elixir: '1.12.0'
-          - otp: '24.0'
-            elixir: '1.11.4'
+          - otp: '23.0'
+            elixir: '1.14.3'
           - otp: '24.0'
             elixir: '1.12.0'
+          - otp: '24.0'
+            elixir: '1.14.3'
+          - otp: '25.0'
+            elixir: '1.13.4'
+          - otp: '25.0'
+            elixir: '1.14.3'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
+        uses: dtolnay/rust-toolchain@stable
 
       - name: Set up Elixir
         uses: erlef/setup-beam@v1

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## Unreleased
 
+### Compatibility
+
+  * No longer support Elixir versions under 1.12 or Erlang/OTP versions under 23.0
+  * Support Elixir 1.13 and 1.14 and Erlang/OTP 25.0
+  * Use Rustler v0.27
+
+### Enhancements
+
+  * Use Rust 2018 edition
+  * Update to latest versions of `html5ever`, `xml5ever`, and `rustler`
+
+### Fixes
+
+  * Fix Rust formatting and clippy issues
+
 ## v0.13.1 (2021-10-20)
 
 ### Compatibility

README.md

@@ -7,7 +7,7 @@ Originally a fork of Hansihe's [html5ever_elixir](https://github.com/hansihe/htm
 
 ## Compatibility
 
-Meeseeks_Html5ever requires a minimum combination of Elixir 1.7.0 and Erlang/OTP 21.0, and is tested with a maximum combination of Elixir 1.12.0 and Erlang/OTP 24.0.
+Meeseeks_Html5ever requires a minimum combination of Elixir 1.12.0 and Erlang/OTP 23.0, and is tested with a maximum combination of Elixir 1.14.0 and Erlang/OTP 25.0.
 
 ## Dependencies
 

config/config.exs

@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 config :meeseeks_html5ever, MeeseeksHtml5ever.Native,
   path: "native/meeseeks_html5ever_nif",

mix.exs

@@ -9,7 +9,7 @@ defmodule MeeseeksHtml5ever.Mixfile do
       name: "MeeseeksHtml5ever",
       version: @version,
       description: description(),
-      elixir: "~> 1.7",
+      elixir: "~> 1.12",
       deps: deps(),
       package: package(),
       source_url: "https://github.com/mischov/meeseeks_html5ever",
@@ -26,7 +26,7 @@ defmodule MeeseeksHtml5ever.Mixfile do
 
   defp deps do
     [
-      {:rustler, "~> 0.22.0"},
+      {:rustler, "~> 0.27.0"},
 
       # docs
       {:ex_doc, "~> 0.21.0", only: :docs, runtime: false}

mix.lock

@@ -3,10 +3,11 @@
   "earmark_parser": {:hex, :earmark_parser, "1.4.13", "0c98163e7d04a15feb62000e1a891489feb29f3d10cb57d4f845c405852bbef8", [:mix], [], "hexpm", "d602c26af3a0af43d2f2645613f65841657ad6efc9f0e361c3b6c06b578214ba"},
   "ex_doc": {:hex, :ex_doc, "0.21.3", "857ec876b35a587c5d9148a2512e952e24c24345552259464b98bfbb883c7b42", [:mix], [{:earmark, "~> 1.4", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm", "0db1ee8d1547ab4877c5b5dffc6604ef9454e189928d5ba8967d4a58a801f161"},
   "hoedown": {:git, "https://github.com/hoedown/hoedown.git", "980b9c549b4348d50b683ecee6abee470b98acda", []},
+  "jason": {:hex, :jason, "1.4.0", "e855647bc964a44e2f67df589ccf49105ae039d4179db7f6271dfd3843dc27e6", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"},
   "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.15.1", "b5888c880d17d1cc3e598f05cdb5b5a91b7b17ac4eaf5f297cb697663a1094dd", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "db68c173234b07ab2a07f645a5acdc117b9f99d69ebf521821d89690ae6c6ec8"},
   "markdown": {:git, "https://github.com/devinus/markdown.git", "d065dbcc4e242a85ca2516fdadd0082712871fd8", []},
   "nimble_parsec": {:hex, :nimble_parsec, "1.1.0", "3a6fca1550363552e54c216debb6a9e95bd8d32348938e13de5eda962c0d7f89", [:mix], [], "hexpm", "08eb32d66b706e913ff748f11694b17981c0b04a33ef470e33e11b3d3ac8f54b"},
-  "rustler": {:hex, :rustler, "0.22.0", "e2930f9d6933e910f87526bb0a7f904e32b62a7e838a3ca4a884ee7fdfb957ed", [:mix], [{:toml, "~> 0.5.2", [hex: :toml, repo: "hexpm", optional: false]}], "hexpm", "01f5989dd511ebec09be481e07d3c59773d5373c5061e09d3ebc3ef61811b49d"},
-  "toml": {:hex, :toml, "0.5.2", "e471388a8726d1ce51a6b32f864b8228a1eb8edc907a0edf2bb50eab9321b526", [:mix], [], "hexpm", "f1e3dabef71fb510d015fad18c0e05e7c57281001141504c6b69d94e99750a07"},
+  "rustler": {:hex, :rustler, "0.27.0", "53ffe86586fd1a2ea60ad07f1506962914eb669dba26c23010cf672662ec8d64", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:toml, "~> 0.6", [hex: :toml, repo: "hexpm", optional: false]}], "hexpm", "d7f5ccaec6e7a96f700330898ff2e9d48818e40789fd2951ba41ecf457986e92"},
+  "toml": {:hex, :toml, "0.7.0", "fbcd773caa937d0c7a02c301a1feea25612720ac3fa1ccb8bfd9d30d822911de", [:mix], [], "hexpm", "0690246a2478c1defd100b0c9b89b4ea280a22be9a7b313a8a058a2408a2fa70"},
 }

native/meeseeks_html5ever_nif/Cargo.toml

@@ -2,16 +2,19 @@
 name = "meeseeks_html5ever_nif"
 version = "0.13.1"
 authors = ["Mischov <mmischov@gmail.com>"]
+edition = "2018"
 
 [lib]
 name = "meeseeks_html5ever_nif"
 path = "src/lib.rs"
 crate-type = ["cdylib"]
 
 [dependencies]
-rustler = "0.22"
+rustler = "0.27"
+
+html5ever = "0.26"
+xml5ever = "0.17"
+markup5ever = "0.11"
 
-html5ever = "0.22"
-xml5ever = "0.12"
-markup5ever = "0.7"
 tendril = "0.4"
+lazy_static = "1.4"

native/meeseeks_html5ever_nif/src/flat_dom.rs

@@ -4,7 +4,9 @@ use std::default::Default;
 
 use html5ever::tree_builder::{ElementFlags, NodeOrText, QuirksMode, TreeSink};
 use html5ever::{Attribute, QualName};
+
 use markup5ever::ExpandedName;
+use markup5ever::{local_name, namespace_url, ns};
 
 use tendril::StrTendril;
 
@@ -59,8 +61,8 @@ impl NodeEnum {
     fn script_or_style(&self) -> ScriptOrStyle {
         match *self {
             Element(ref name, ..) => match name.expanded() {
-                expanded_name!(html "script") => ScriptOrStyle::Script,
-                expanded_name!(html "style") => ScriptOrStyle::Style,
+                markup5ever::expanded_name!(html "script") => ScriptOrStyle::Script,
+                markup5ever::expanded_name!(html "style") => ScriptOrStyle::Style,
                 _ => ScriptOrStyle::Neither,
             },
             _ => ScriptOrStyle::Neither,
@@ -91,10 +93,10 @@ impl Node {
     fn new(id: Id, node: NodeEnum) -> Node {
         Node {
             parent: Parent::None,
-            id: id,
+            id,
             children: vec![],
             last_string: false,
-            node: node,
+            node,
         }
     }
 
@@ -195,7 +197,7 @@ impl TreeSink for FlatDom {
     fn get_template_contents(&mut self, target: &Self::Handle) -> Self::Handle {
         if let Element(_, _, true) = self.node(*target).node {
             // Use template element as document fragment
-            target.clone()
+            *target
         } else {
             panic!("not a template element!")
         }
@@ -336,7 +338,7 @@ impl TreeSink for FlatDom {
 // NIF Encoding
 
 mod atoms {
-    atoms! {
+    rustler::atoms! {
         nil,
 
         parent,
@@ -379,20 +381,20 @@ mod atoms {
 // Unsure if this is a great way of doing it, but it's the way
 // that produced the cleanest and least noisy code.
 
-struct QNW<'a>(&'a QualName);
+struct Qnw<'a>(&'a QualName);
 
-impl<'b> Encoder for QNW<'b> {
+impl<'b> Encoder for Qnw<'b> {
     fn encode<'a>(&self, env: Env<'a>) -> Term<'a> {
-        let local: &str = &*self.0.local;
+        let local: &str = &self.0.local;
         local.encode(env)
     }
 }
 
-struct STW<'a>(&'a StrTendril);
+struct Stw<'a>(&'a StrTendril);
 
-impl<'b> Encoder for STW<'b> {
+impl<'b> Encoder for Stw<'b> {
     fn encode<'a>(&self, env: Env<'a>) -> Term<'a> {
-        let data: &str = &*self.0;
+        let data: &str = self.0;
         data.encode(env)
     }
 }
@@ -437,7 +439,7 @@ impl Encoder for DataType {
 // Node
 
 fn split_ns_and_tag(ns_tag: &str) -> (&str, &str) {
-    let first_colon = ns_tag.find(':').unwrap_or_else(|| ns_tag.len());
+    let first_colon = ns_tag.find(':').unwrap_or(ns_tag.len());
     match ns_tag.split_at(first_colon) {
         (tag, "") => ("", tag),
         (ns, tag) => (ns, &tag[1..]),
@@ -477,7 +479,7 @@ impl Encoder for Node {
                     document_comment_atom,
                     self.parent.encode(env),
                     self.id.encode(env),
-                    STW(content).encode(env),
+                    Stw(content).encode(env),
                 ];
                 Term::map_from_arrays(env, &keys, &values).ok().unwrap()
             }
@@ -492,7 +494,7 @@ impl Encoder for Node {
                     self.parent.encode(env),
                     self.id.encode(env),
                     data_type.encode(env),
-                    STW(content).encode(env),
+                    Stw(content).encode(env),
                 ];
                 Term::map_from_arrays(env, &keys, &values).ok().unwrap()
             }
@@ -514,9 +516,9 @@ impl Encoder for Node {
                     document_doctype_atom,
                     self.parent.encode(env),
                     self.id.encode(env),
-                    STW(name).encode(env),
-                    STW(public).encode(env),
-                    STW(system).encode(env),
+                    Stw(name).encode(env),
+                    Stw(public).encode(env),
+                    Stw(system).encode(env),
                 ];
                 Term::map_from_arrays(env, &keys, &values).ok().unwrap()
             }
@@ -529,10 +531,10 @@ impl Encoder for Node {
                 let tag_atom = atoms::tag().encode(env);
                 let attributes_atom = atoms::attributes().encode(env);
                 let children_atom = atoms::children().encode(env);
-                let (namespace, tag) = ns_and_tag(&name);
+                let (namespace, tag) = ns_and_tag(name);
                 let attribute_terms: Vec<Term<'a>> = attributes
                     .iter()
-                    .map(|a| (QNW(&a.name), STW(&a.value)).encode(env))
+                    .map(|a| (Qnw(&a.name), Stw(&a.value)).encode(env))
                     .collect();
                 let keys = vec![
                     struct_atom,
@@ -564,8 +566,8 @@ impl Encoder for Node {
                     document_pi_atom,
                     self.parent.encode(env),
                     self.id.encode(env),
-                    STW(target).encode(env),
-                    STW(data).encode(env),
+                    Stw(target).encode(env),
+                    Stw(data).encode(env),
                 ];
                 Term::map_from_arrays(env, &keys, &values).ok().unwrap()
             }
@@ -578,7 +580,7 @@ impl Encoder for Node {
                     document_text_atom,
                     self.parent.encode(env),
                     self.id.encode(env),
-                    STW(content).encode(env),
+                    Stw(content).encode(env),
                 ];
                 Term::map_from_arrays(env, &keys, &values).ok().unwrap()
             }

native/meeseeks_html5ever_nif/src/lib.rs

@@ -1,11 +1,3 @@
-#[macro_use]
-extern crate rustler;
-extern crate html5ever;
-extern crate xml5ever;
-#[macro_use]
-extern crate markup5ever;
-extern crate tendril;
-
 use std::panic;
 
 mod flat_dom;
@@ -28,7 +20,7 @@ use tendril::TendrilSink;
 // If using term_to_configs, remove this mod atoms and use commented
 
 mod atoms {
-    atoms! {
+    rustler::atoms! {
         html5ever_nif_result,
 
         ok,
@@ -46,7 +38,7 @@ use html5ever::tree_builder::TreeBuilderOpts;
 use html5ever::tree_builder::interface::QuirksMode;
 
 mod atoms {
-    atoms! {
+    rustler::atoms! {
         html5ever_nif_result,
 
         ok,
@@ -179,7 +171,11 @@ fn parse_xml<'a>(env: Env<'a>, document: Binary) -> NifResult<Term<'a>> {
     parse(ParserType::XmlDocument, env, document)
 }
 
-rustler::init!("Elixir.MeeseeksHtml5ever.Native", [parse_html, parse_xml], load = load);
+rustler::init!(
+    "Elixir.MeeseeksHtml5ever.Native",
+    [parse_html, parse_xml],
+    load = load
+);
 
 fn load(_env: Env, _load_info: Term) -> bool {
     true