Add hypertext and vy

Author: Kijewski

Cargo.toml

@@ -24,20 +24,22 @@ license = "Apache-2.0"
 [features]
 default = ["compiled", "interpreted"]
 
-compiled = ["askama", "askama_git", "horrorshow", "markup", "maud", "ructe", "sailfish"]
+compiled = ["askama", "askama_git", "horrorshow", "hypertext", "markup", "maud", "ructe", "sailfish", "vy"]
 interpreted = ["handlebars", "minijinja", "tera", "tinytemplate"]
 
 askama = ["dep:askama", "_contains_compiled"]
 askama_git = ["dep:askama_git", "_contains_compiled"]
 handlebars = ["dep:handlebars", "_contains_interpreted"]
 horrorshow = ["dep:horrorshow", "_contains_compiled"]
+hypertext = ["dep:hypertext", "_contains_compiled"]
 markup = ["dep:markup", "_contains_compiled"]
 maud = ["dep:maud", "_contains_compiled"]
 minijinja = ["dep:minijinja", "_contains_interpreted"]
 ructe = ["dep:ructe", "_contains_compiled"]
 sailfish = ["dep:sailfish", "_contains_compiled"]
 tera = ["dep:tera", "_contains_interpreted"]
 tinytemplate = ["dep:tinytemplate", "_contains_interpreted"]
+vy = ["dep:vy", "_contains_compiled"]
 
 _contains_compiled = []
 _contains_interpreted = []
@@ -49,13 +51,15 @@ askama = { version = "*", optional = true, path = "tmpls/askama", package = "tmp
 askama_git = { version = "*", optional = true, path = "tmpls/askama_git", package = "tmpl-askama_git" }
 handlebars = { version = "*", optional = true, path = "tmpls/handlebars", package = "tmpl-handlebars" }
 horrorshow = { version = "*", optional = true, path = "tmpls/horrorshow", package = "tmpl-horrorshow" }
+hypertext = { version = "*", optional = true, path = "tmpls/hypertext", package = "tmpl-hypertext" }
 markup = { version = "*", optional = true, path = "tmpls/markup", package = "tmpl-markup" }
 maud = { version = "*", optional = true, path = "tmpls/maud", package = "tmpl-maud" }
 minijinja = { version = "*", optional = true, path = "tmpls/minijinja", package = "tmpl-minijinja" }
 ructe = { version = "*", optional = true, path = "tmpls/ructe", package = "tmpl-ructe" }
 sailfish = { version = "*", optional = true, path = "tmpls/sailfish", package = "tmpl-sailfish" }
 tera = { version = "*", optional = true, path = "tmpls/tera", package = "tmpl-tera" }
 tinytemplate = { version = "*", optional = true, path = "tmpls/tinytemplate", package = "tmpl-tinytemplate" }
+vy = { version = "*", optional = true, path = "tmpls/vy", package = "tmpl-vy" }
 
 ahash = { version = "0.8.11", features = ["no-rng"] }
 criterion = { version = "0.5.1", features = ["html_reports"] }

README.md

@@ -18,13 +18,15 @@ All of them are well maintained, mature and perform HTML escaping automatically.
 | [askama]       | [![][docs-img-askama]][docs-askama]             | [![][img-repo]][repo-askama]       | pre-compiled | [![][dl-askama]][askama]             | [![][stars-askama]][repo-askama]             | [![][contr-askama]][repo-askama]             | [![][act-askama]][repo-askama]             |
 | [handlebars]   | [![][docs-img-handlebars]][docs-handlebars]     | [![][img-repo]][repo-handlebars]   | interpreted  | [![][dl-handlebars]][handlebars]     | [![][stars-handlebars]][repo-handlebars]     | [![][contr-handlebars]][repo-handlebars]     | [![][act-handlebars]][repo-handlebars]     |
 | [horrorshow]   | [![][docs-img-horrorshow]][docs-horrorshow]     | [![][img-repo]][repo-horrorshow]   | pre-compiled | [![][dl-horrorshow]][horrorshow]     | [![][stars-horrorshow]][repo-horrorshow]     | [![][contr-horrorshow]][repo-horrorshow]     | [![][act-horrorshow]][repo-horrorshow]     |
+| [hypertext]    | [![][docs-img-hypertext]][docs-hypertext]       | [![][img-repo]][repo-hypertext]    | pre-compiled | [![][dl-hypertext]][hypertext]       | [![][stars-hypertext]][repo-hypertext]       | [![][contr-hypertext]][repo-hypertext]       | [![][act-hypertext]][repo-hypertext]       |
 | [markup]       | [![][docs-img-markup]][docs-markup]             | [![][img-repo]][repo-markup]       | pre-compiled | [![][dl-markup]][markup]             | [![][stars-markup]][repo-markup]             | [![][contr-markup]][repo-markup]             | [![][act-markup]][repo-markup]             |
 | [maud]         | [![][docs-img-maud]][docs-maud]                 | [![][img-repo]][repo-maud]         | pre-compiled | [![][dl-maud]][maud]                 | [![][stars-maud]][repo-maud]                 | [![][contr-maud]][repo-maud]                 | [![][act-maud]][repo-maud]                 |
 | [minijinja]    | [![][docs-img-minijinja]][docs-minijinja]       | [![][img-repo]][repo-minijinja]    | interpreted  | [![][dl-minijinja]][minijinja]       | [![][stars-minijinja]][repo-minijinja]       | [![][contr-minijinja]][repo-minijinja]       | [![][act-minijinja]][repo-minijinja]       |
 | [ructe]        | [![][docs-img-ructe]][docs-ructe]               | [![][img-repo]][repo-ructe]        | pre-compiled | [![][dl-ructe]][ructe]               | [![][stars-ructe]][repo-ructe]               | [![][contr-ructe]][repo-ructe]               | [![][act-ructe]][repo-ructe]               |
 | [sailfish]     | [![][docs-img-sailfish]][docs-sailfish]         | [![][img-repo]][repo-sailfish]     | pre-compiled | [![][dl-sailfish]][sailfish]         | [![][stars-sailfish]][repo-sailfish]         | [![][contr-sailfish]][repo-sailfish]         | [![][act-sailfish]][repo-sailfish]         |
 | [tera]         | [![][docs-img-tera]][docs-tera]                 | [![][img-repo]][repo-tera]         | interpreted  | [![][dl-tera]][tera]                 | [![][stars-tera]][repo-tera]                 | [![][contr-tera]][repo-tera]                 | [![][act-tera]][repo-tera]                 |
 | [tinytemplate] | [![][docs-img-tinytemplate]][docs-tinytemplate] | [![][img-repo]][repo-tinytemplate] | interpreted  | [![][dl-tinytemplate]][tinytemplate] | [![][stars-tinytemplate]][repo-tinytemplate] | [![][contr-tinytemplate]][repo-tinytemplate] | [![][act-tinytemplate]][repo-tinytemplate] |
+| [vy]           | [![][docs-img-vy]][docs-vy]                     | [![][img-repo]][repo-vy]           | pre-compiled | [![][dl-vy]][vy]                     | [![][stars-vy]][repo-vy]                     | [![][contr-vy]][repo-vy]                     | [![][act-vy]][repo-vy]                     |
 
 Please see also [*Rust web framework comparison*].
 
@@ -53,87 +55,103 @@ Run `./generate-table.py` to generate the table you see above.
 [askama]: <https://crates.io/crates/askama/>
 [handlebars]: <https://crates.io/crates/handlebars/>
 [horrorshow]: <https://crates.io/crates/horrorshow/>
+[hypertext]: <https://crates.io/crates/hypertext/>
 [markup]: <https://crates.io/crates/markup/>
 [maud]: <https://crates.io/crates/maud/>
 [minijinja]: <https://crates.io/crates/minijinja/>
 [ructe]: <https://crates.io/crates/ructe/>
 [sailfish]: <https://crates.io/crates/sailfish/>
 [tera]: <https://crates.io/crates/tera/>
 [tinytemplate]: <https://crates.io/crates/tinytemplate/>
+[vy]: <https://crates.io/crates/vy/>
 
 [docs-askama]: <https://docs.rs/askama/latest/askama>
 [docs-handlebars]: <https://docs.rs/handlebars/latest/handlebars>
 [docs-horrorshow]: <https://docs.rs/horrorshow/latest/horrorshow>
+[docs-hypertext]: <https://docs.rs/hypertext/latest/hypertext>
 [docs-markup]: <https://docs.rs/markup/latest/markup>
 [docs-maud]: <https://docs.rs/maud/latest/maud>
 [docs-minijinja]: <https://docs.rs/minijinja/latest/minijinja>
 [docs-ructe]: <https://docs.rs/ructe/latest/ructe>
 [docs-sailfish]: <https://docs.rs/sailfish/latest/sailfish>
 [docs-tera]: <https://docs.rs/tera/latest/tera>
 [docs-tinytemplate]: <https://docs.rs/tinytemplate/latest/tinytemplate>
+[docs-vy]: <https://docs.rs/vy/latest/vy>
 
 [docs-img-askama]: <https://img.shields.io/docsrs/askama?label=&style=flat-square>
 [docs-img-handlebars]: <https://img.shields.io/docsrs/handlebars?label=&style=flat-square>
 [docs-img-horrorshow]: <https://img.shields.io/docsrs/horrorshow?label=&style=flat-square>
+[docs-img-hypertext]: <https://img.shields.io/docsrs/hypertext?label=&style=flat-square>
 [docs-img-markup]: <https://img.shields.io/docsrs/markup?label=&style=flat-square>
 [docs-img-maud]: <https://img.shields.io/docsrs/maud?label=&style=flat-square>
 [docs-img-minijinja]: <https://img.shields.io/docsrs/minijinja?label=&style=flat-square>
 [docs-img-ructe]: <https://img.shields.io/docsrs/ructe?label=&style=flat-square>
 [docs-img-sailfish]: <https://img.shields.io/docsrs/sailfish?label=&style=flat-square>
 [docs-img-tera]: <https://img.shields.io/docsrs/tera?label=&style=flat-square>
 [docs-img-tinytemplate]: <https://img.shields.io/docsrs/tinytemplate?label=&style=flat-square>
+[docs-img-vy]: <https://img.shields.io/docsrs/vy?label=&style=flat-square>
 
 [dl-askama]: <https://img.shields.io/crates/dr/askama?label=&color=f8f8f8&style=flat-square>
 [dl-handlebars]: <https://img.shields.io/crates/dr/handlebars?label=&color=f8f8f8&style=flat-square>
 [dl-horrorshow]: <https://img.shields.io/crates/dr/horrorshow?label=&color=f8f8f8&style=flat-square>
+[dl-hypertext]: <https://img.shields.io/crates/dr/hypertext?label=&color=f8f8f8&style=flat-square>
 [dl-markup]: <https://img.shields.io/crates/dr/markup?label=&color=f8f8f8&style=flat-square>
 [dl-maud]: <https://img.shields.io/crates/dr/maud?label=&color=f8f8f8&style=flat-square>
 [dl-minijinja]: <https://img.shields.io/crates/dr/minijinja?label=&color=f8f8f8&style=flat-square>
 [dl-ructe]: <https://img.shields.io/crates/dr/ructe?label=&color=f8f8f8&style=flat-square>
 [dl-sailfish]: <https://img.shields.io/crates/dr/sailfish?label=&color=f8f8f8&style=flat-square>
 [dl-tera]: <https://img.shields.io/crates/dr/tera?label=&color=f8f8f8&style=flat-square>
 [dl-tinytemplate]: <https://img.shields.io/crates/dr/tinytemplate?label=&color=f8f8f8&style=flat-square>
+[dl-vy]: <https://img.shields.io/crates/dr/vy?label=&color=f8f8f8&style=flat-square>
 
 [stars-askama]: <https://img.shields.io/github/stars/askama-rs/askama?label=&color=f8f8f8&style=flat-square>
 [stars-handlebars]: <https://img.shields.io/github/stars/sunng87/handlebars-rust?label=&color=f8f8f8&style=flat-square>
 [stars-horrorshow]: <https://img.shields.io/github/stars/Stebalien/horrorshow-rs?label=&color=f8f8f8&style=flat-square>
+[stars-hypertext]: <https://github.com/vidhanio/hypertext>
 [stars-markup]: <https://img.shields.io/github/stars/utkarshkukreti/markup.rs?label=&color=f8f8f8&style=flat-square>
 [stars-maud]: <https://img.shields.io/github/stars/lambda-fairy/maud?label=&color=f8f8f8&style=flat-square>
 [stars-minijinja]: <https://img.shields.io/github/stars/mitsuhiko/minijinja?label=&color=f8f8f8&style=flat-square>
 [stars-ructe]: <https://img.shields.io/github/stars/kaj/ructe?label=&color=f8f8f8&style=flat-square>
 [stars-sailfish]: <https://img.shields.io/github/stars/rust-sailfish/sailfish?label=&color=f8f8f8&style=flat-square>
 [stars-tera]: <https://img.shields.io/github/stars/Keats/tera?label=&color=f8f8f8&style=flat-square>
 [stars-tinytemplate]: <https://img.shields.io/github/stars/bheisler/TinyTemplate?label=&color=f8f8f8&style=flat-square>
+[stars-vy]: <https://img.shields.io/github/stars/JonahLund/vy?label=&color=f8f8f8&style=flat-square>
 
 [contr-askama]: <https://img.shields.io/github/contributors/askama-rs/askama?label=&color=f8f8f8&style=flat-square>
 [contr-handlebars]: <https://img.shields.io/github/contributors/sunng87/handlebars-rust?label=&color=f8f8f8&style=flat-square>
 [contr-horrorshow]: <https://img.shields.io/github/contributors/Stebalien/horrorshow-rs?label=&color=f8f8f8&style=flat-square>
+[contr-hypertext]: <https://img.shields.io/github/contributors/vidhanio/hypertext?label=&color=f8f8f8&style=flat-square>
 [contr-markup]: <https://img.shields.io/github/contributors/utkarshkukreti/markup.rs?label=&color=f8f8f8&style=flat-square>
 [contr-maud]: <https://img.shields.io/github/contributors/lambda-fairy/maud?label=&color=f8f8f8&style=flat-square>
 [contr-minijinja]: <https://img.shields.io/github/contributors/mitsuhiko/minijinja?label=&color=f8f8f8&style=flat-square>
 [contr-ructe]: <https://img.shields.io/github/contributors/kaj/ructe?label=&color=f8f8f8&style=flat-square>
 [contr-sailfish]: <https://img.shields.io/github/contributors/rust-sailfish/sailfish?label=&color=f8f8f8&style=flat-square>
 [contr-tera]: <https://img.shields.io/github/contributors/Keats/tera?label=&color=f8f8f8&style=flat-square>
 [contr-tinytemplate]: <https://img.shields.io/github/contributors/bheisler/TinyTemplate?label=&color=f8f8f8&style=flat-square>
+[contr-vy]: <https://img.shields.io/github/contributors/JonahLund/vy?label=&color=f8f8f8&style=flat-square>
 
 [act-askama]: <https://img.shields.io/github/commit-activity/y/askama-rs/askama?label=&color=f8f8f8&style=flat-square>
 [act-handlebars]: <https://img.shields.io/github/commit-activity/y/sunng87/handlebars-rust?label=&color=f8f8f8&style=flat-square>
 [act-horrorshow]: <https://img.shields.io/github/commit-activity/y/Stebalien/horrorshow-rs?label=&color=f8f8f8&style=flat-square>
+[act-hypertext]: <https://img.shields.io/github/commit-activity/y/vidhanio/hypertext?label=&color=f8f8f8&style=flat-square>
 [act-markup]: <https://img.shields.io/github/commit-activity/y/utkarshkukreti/markup.rs?label=&color=f8f8f8&style=flat-square>
 [act-maud]: <https://img.shields.io/github/commit-activity/y/lambda-fairy/maud?label=&color=f8f8f8&style=flat-square>
 [act-minijinja]: <https://img.shields.io/github/commit-activity/y/mitsuhiko/minijinja?label=&color=f8f8f8&style=flat-square>
 [act-ructe]: <https://img.shields.io/github/commit-activity/y/kaj/ructe?label=&color=f8f8f8&style=flat-square>
 [act-sailfish]: <https://img.shields.io/github/commit-activity/y/rust-sailfish/sailfish?label=&color=f8f8f8&style=flat-square>
 [act-tera]: <https://img.shields.io/github/commit-activity/y/Keats/tera?label=&color=f8f8f8&style=flat-square>
 [act-tinytemplate]: <https://img.shields.io/github/commit-activity/y/bheisler/TinyTemplate?label=&color=f8f8f8&style=flat-square>
+[act-vy]: <https://img.shields.io/github/commit-activity/y/JonahLund/vy?label=&color=f8f8f8&style=flat-square>
 
 [repo-askama]: <https://github.com/askama-rs/askama>
 [repo-handlebars]: <https://github.com/sunng87/handlebars-rust>
 [repo-horrorshow]: <https://github.com/Stebalien/horrorshow-rs>
+[repo-hypertext]: <https://github.com/vidhanio/hypertext>
 [repo-markup]: <https://github.com/utkarshkukreti/markup.rs>
 [repo-maud]: <https://github.com/lambda-fairy/maud>
 [repo-minijinja]: <https://github.com/mitsuhiko/minijinja>
 [repo-ructe]: <https://github.com/kaj/ructe>
 [repo-sailfish]: <https://github.com/rust-sailfish/sailfish>
 [repo-tera]: <https://github.com/Keats/tera>
 [repo-tinytemplate]: <https://github.com/bheisler/TinyTemplate>
+[repo-vy]: <https://github.com/JonahLund/vy>

src/lib.rs

@@ -35,6 +35,8 @@ macro_rules! for_each {
             for_each!(askama_git, group, $input:$Input, $func);
             #[cfg(feature = "horrorshow")]
             for_each!(horrorshow, group, $input:$Input, $func);
+            #[cfg(feature = "hypertext")]
+            for_each!(hypertext, group, $input:$Input, $func);
             #[cfg(feature = "markup")]
             for_each!(markup, group, $input:$Input, $func);
             #[cfg(feature = "maud")]
@@ -43,6 +45,8 @@ macro_rules! for_each {
             for_each!(ructe, group, $input:$Input, $func);
             #[cfg(feature = "sailfish")]
             for_each!(sailfish, group, $input:$Input, $func);
+            #[cfg(feature = "vy")]
+            for_each!(vy, group, $input:$Input, $func);
 
             group.finish();
         };

src/main.rs

@@ -78,6 +78,8 @@ const TMPLS: &[(&str, fn(Case) -> Result<(), Error>)] = &[
     ("handlebars", tmpl::<handlebars::Benchmark>),
     #[cfg(feature = "horrorshow")]
     ("horrorshow", tmpl::<horrorshow::Benchmark>),
+    #[cfg(feature = "hypertext")]
+    ("hypertext", tmpl::<hypertext::Benchmark>),
     #[cfg(feature = "markup")]
     ("markup", tmpl::<markup::Benchmark>),
     #[cfg(feature = "maud")]
@@ -92,6 +94,8 @@ const TMPLS: &[(&str, fn(Case) -> Result<(), Error>)] = &[
     ("tera", tmpl::<tera::Benchmark>),
     #[cfg(feature = "tinytemplate")]
     ("tinytemplate", tmpl::<tinytemplate::Benchmark>),
+    #[cfg(feature = "vy")]
+    ("vy", tmpl::<vy::Benchmark>),
 ];
 
 struct Tmpls(usize);

tmpls/hypertext/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "tmpl-hypertext"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "Apache-2.0"
+
+[dependencies]
+tmpls = { version = "*", path = ".." }
+
+hypertext = "0.6.3"

tmpls/hypertext/src/lib.rs

@@ -0,0 +1,56 @@
+use std::convert::Infallible;
+
+use hypertext::{GlobalAttributes, Renderable, html_elements, maud};
+use tmpls::{BigTable, Teams};
+
+#[derive(Debug, Default)]
+pub struct Benchmark;
+
+impl tmpls::Benchmark for Benchmark {
+    type Output = String;
+    type Error = Infallible;
+
+    fn big_table(
+        &mut self,
+        output: &mut Self::Output,
+        input: &BigTable,
+    ) -> Result<(), Self::Error> {
+        *output = maud! {
+            table {
+                @for row in &input.table {
+                    tr {
+                        @for col in row {
+                            td { (*col) }
+                        }
+                    }
+                }
+            }
+        }
+        .render()
+        .0;
+        Ok(())
+    }
+
+    fn teams(&mut self, output: &mut Self::Output, input: &Teams) -> Result<(), Self::Error> {
+        *output = maud! {
+            html {
+                head {
+                    title { (input.year) }
+                }
+                body {
+                    h1 { "CLS " (input.year) }
+                    ul {
+                        @for (idx, team) in input.teams.iter().enumerate() {
+                            li.champion[idx == 0] {
+                                b { (team.name.as_str()) } ": " (team.score)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        .render()
+        .0;
+        Ok(())
+    }
+}

tmpls/vy/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "tmpl-vy"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "Apache-2.0"
+
+[dependencies]
+tmpls = { version = "*", path = ".." }
+
+vy = "0.2.0"

tmpls/vy/src/lib.rs

@@ -0,0 +1,57 @@
+use std::convert::Infallible;
+
+use tmpls::{BigTable, Output, Teams};
+use vy::{Buffer, IntoHtml, b, body, h1, head, html, li, table, td, title, tr, ul};
+
+#[derive(Debug, Default)]
+pub struct Benchmark;
+
+impl tmpls::Benchmark for Benchmark {
+    type Output = WrappedBuffer;
+    type Error = Infallible;
+
+    fn big_table(
+        &mut self,
+        output: &mut Self::Output,
+        input: &BigTable,
+    ) -> Result<(), Self::Error> {
+        table!(
+            input
+                .table
+                .iter()
+                .map(|row| tr!(row.iter().map(|col| td!(*col))))
+        )
+        .escape_and_write(&mut output.0);
+        Ok(())
+    }
+
+    fn teams(&mut self, output: &mut Self::Output, input: &Teams) -> Result<(), Self::Error> {
+        html!(
+            head!(title!(input.year)),
+            body!(
+                h1!("CLS ", input.year),
+                ul!(input.teams.iter().enumerate().map(|(idx, team)| {
+                    li!(
+                        class = (idx == 0).then_some("champion"),
+                        b!(team.name.as_str(), ": ", team.score)
+                    )
+                }))
+            )
+        )
+        .escape_and_write(&mut output.0);
+        Ok(())
+    }
+}
+
+#[derive(Default)]
+pub struct WrappedBuffer(Buffer);
+
+impl Output for WrappedBuffer {
+    fn clear(&mut self) {
+        unsafe { self.0._set_len(0) };
+    }
+
+    fn as_bytes(&self) -> &[u8] {
+        self.0.as_str().as_bytes()
+    }
+}