Merge pull request #70 from mkantor/upgrade-dependencies

Upgrade dependencies.

Author: mkantor

Cargo.lock

@@ -32,24 +32,24 @@ include = [
 [dependencies]
 actix-rt = "1.1.1"
 actix-web = "3.3.2"
-anyhow = "1.0.41"
+anyhow = "1.0.43"
 bytes = "0.5.6"
-futures = "0.3.15"
-handlebars = "4.1.0"
+futures = "0.3.16"
+handlebars = "4.1.2"
 log = "0.4.14"
 mime = "0.3.16"
 mime_guess = "2.0.3"
-serde = { version = "1.0.126", features = ["derive"] }
-serde_json = { version = "1.0.64", features = ["preserve_order"] }
+serde = { version = "1.0.130", features = ["derive"] }
+serde_json = { version = "1.0.67", features = ["preserve_order"] }
 stderrlog = "0.5.1"
-structopt = "0.3.21"
-thiserror = "1.0.25"
+structopt = "0.3.22"
+thiserror = "1.0.28"
 walkdir = "2.3.2"
 
 [dev-dependencies]
-criterion = "0.3.4"
-env_logger = "0.8.4"
-insta = "1.7.1"
+criterion = "0.3.5"
+env_logger = "0.9.0"
+insta = "1.7.2"
 lazy_static = "1.4.0"
 maplit = "1.0.2"
 regex = "1.5.4"

Cargo.toml

@@ -517,7 +517,7 @@ mod tests {
 
         let template = "this is partial: {{> abc.html.hbs}}";
         let expected_output =
-            "this is partial: a\nb\nc\n\nsubdirectory entries:\n/subdirectory/c\n";
+            "this is partial: a\nb\n\nc\n\nsubdirectory entries:\n/subdirectory/c\n";
 
         let renderable = content_engine
             .new_template(
@@ -548,7 +548,7 @@ mod tests {
         let content_engine = shared_content_engine.read().unwrap();
 
         let route = route("/abc");
-        let expected_output = "a\nb\nc\n\nsubdirectory entries:\n/subdirectory/c\n";
+        let expected_output = "a\nb\n\nc\n\nsubdirectory entries:\n/subdirectory/c\n";
 
         let content = content_engine
             .get(&route)

src/content/content_engine.rs

@@ -5,8 +5,8 @@ input_file: samples/partials
 
 ---
 a.html.hbs: "a\n"
-ab.html.hbs: "a\nb\n"
-abc.html.hbs: "a\nb\nc\n\nsubdirectory entries:\n/subdirectory/c\n"
+ab.html.hbs: "a\nb\n\n"
+abc.html.hbs: "a\nb\n\nc\n\nsubdirectory entries:\n/subdirectory/c\n"
 b.html: "b\n"
 subdirectory.html.hbs: "subdirectory entries:\n/subdirectory/c\n"
 subdirectory/c.html.hbs: "c\n"