Merge branch 'master' into stable

rust-sailfish · Jul 16, 2020 · c809027 · c809027
2 parents 67f2bc2 + d0ef795
commit c809027
Show file tree

Hide file tree

Showing 90 changed files with 2,624 additions and 1,571 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,11 +3,12 @@ members = [
   "sailfish",
   "sailfish-compiler",
   "sailfish-macros",
-  "examples",
-  "integration-tests"
+  "sailfish-tests/integration-tests"
 ]
 exclude = [
-  "benches"
+  "sailfish-tests/fuzzing-tests",
+  "benches",
+  "examples"
 ]
 
 [profile.dev.package.syn]

diff --git a/README.md b/README.md
@@ -30,8 +30,8 @@ Dependencies:
 
 ```toml
 [dependencies]
-sailfish = "0.1.3"
-sailfish-macros = "0.1.3"
+sailfish = "0.2.0"
+sailfish-macros = "0.2.0"
 ```
 
 Template file (templates/hello.stpl):

diff --git a/benches/Cargo.lock b/benches/Cargo.lock
diff --git a/benches/Cargo.toml b/benches/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "benches"
-version = "0.1.3"
+version = "0.2.0"
 authors = ["Dirkjan Ochtman <dirkjan@ochtman.nl>", "Ryohei Machida <orcinus4627@gmail.com>"]
 build = "src/build.rs"
 edition = "2018"
@@ -25,6 +25,7 @@ serde_yaml = "0.8"
 tera = { git = "https://github.com/Keats/tera" }
 v_htmlescape = "0.9.1"
 yarte = { git = "https://github.com/botika/yarte", features = ["bytes-buf", "fixed"] }
+bytes = "0.5.5"
 
 [build-dependencies]
 ructe = { git = "https://github.com/kaj/ructe" }

diff --git a/benches/src/yarte_bytes.rs b/benches/src/yarte_bytes.rs
@@ -1,3 +1,4 @@
+use bytes::BytesMut;
 use yarte::TemplateBytes;
 
 pub fn big_table(b: &mut criterion::Bencher<'_>, size: &usize) {
@@ -10,7 +11,7 @@ pub fn big_table(b: &mut criterion::Bencher<'_>, size: &usize) {
         table.push(inner);
     }
     let t = BigTable { table };
-    b.iter(|| t.call(109915));
+    b.iter(|| t.call::<BytesMut>(109915));
 }
 
 #[derive(TemplateBytes)]
@@ -42,7 +43,7 @@ pub fn teams(b: &mut criterion::Bencher<'_>) {
             },
         ],
     };
-    b.iter(|| t.call(239));
+    b.iter(|| t.call::<BytesMut>(239));
 }
 
 #[derive(TemplateBytes)]

diff --git a/docs/en/docs/installation.md b/docs/en/docs/installation.md
@@ -4,8 +4,8 @@ In order to use sailfish templates, you have add two dependencies in your `Cargo
 
 ```toml
 [dependencies]
-sailfish = "0.1.3"
-sailfish-macros = "0.1.3"
+sailfish = "0.2.0"
+sailfish-macros = "0.2.0"
 ```
 
 `sailfish` crate contains runtime for rendering contents, and `sailfish-macros` serves you derive macros to compile and import the template files.