From 2feda3ec61be10d336f94d01738aa3c607efedeb Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Fri, 4 Mar 2022 21:35:24 +0100 Subject: [PATCH] Update deps --- CHANGELOG.md | 1 + Cargo.lock | 55 ++++++++++++---------------- components/libs/Cargo.toml | 4 -- components/link_checker/Cargo.toml | 2 +- components/rendering/src/markdown.rs | 2 +- components/templates/Cargo.toml | 2 +- 6 files changed, 28 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9171203d..22e07a49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ also specify classes on headers now - Fix markup for fenced code with linenos - Make `ignored_content` work with nested paths and directories - `zola serve/build` can now run from anywhere in a zola directory +- Add XML support to `load_data` ## 0.15.3 (2022-01-23) diff --git a/Cargo.lock b/Cargo.lock index e593439f..8a2bb4c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -195,9 +195,9 @@ checksum = "72feb31ffc86498dacdbd0fcebb56138e7177a8cc5cea4516031d15ae85a742e" [[package]] name = "bytemuck" -version = "1.7.3" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439989e6b8c38d1b6570a384ef1e49c8848128f5a97f3914baef02920842712f" +checksum = "0e851ca7c24871e7336801608a4797d7376545b6928a10d32d75685687141ead" [[package]] name = "byteorder" @@ -304,9 +304,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.2" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5177fac1ab67102d8989464efd043c6ff44191b1557ec1ddd489b4f7e1447e77" +checksum = "ced1892c55c910c1219e98d6fc8d71f6bddba7905866ce740066d8bfea859312" dependencies = [ "atty", "bitflags", @@ -316,23 +316,23 @@ dependencies = [ "os_str_bytes", "strsim 0.10.0", "termcolor", - "textwrap 0.14.2", + "textwrap 0.15.0", ] [[package]] name = "clap_complete" -version = "3.1.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23eec4dd324308f49d8bf86a2732078c34d57955fec1e1d865554fc37c15d420" +checksum = "df6f3613c0a3cddfd78b41b10203eb322cb29b600cbdf808a7d3db95691b8e25" dependencies = [ - "clap 3.1.2", + "clap 3.1.5", ] [[package]] name = "clap_derive" -version = "3.1.2" +version = "3.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d42c94ce7c2252681b5fed4d3627cc807b13dfc033246bd05d5b252399000e" +checksum = "da95d038ede1a964ce99f49cbe27a7fb538d1da595e4b4f70b8c8f338d17bf16" dependencies = [ "heck 0.4.0", "proc-macro-error", @@ -516,12 +516,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690" -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - [[package]] name = "digest" version = "0.8.1" @@ -1406,7 +1400,6 @@ dependencies = [ "image", "lexical-sort", "minify-html", - "mockito", "nom-bibtex", "num-format", "once_cell", @@ -1747,13 +1740,12 @@ dependencies = [ [[package]] name = "mockito" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d10030163d67f681db11810bc486df3149e6d91c8b4f3f96fa8b62b546c2cef8" +checksum = "401edc088069634afaa5f4a29617b36dba683c0c16fe4435a86debad23fa2f1a" dependencies = [ "assert-json-diff", "colored", - "difference", "httparse", "lazy_static", "log", @@ -1761,6 +1753,7 @@ dependencies = [ "regex", "serde_json", "serde_urlencoded", + "similar", ] [[package]] @@ -1992,9 +1985,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" +checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" [[package]] name = "onig" @@ -2325,9 +2318,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.3" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8f1882177b17c98ec33a51f5910ecbf4db92ca0def706781a1f8d0c661f393" +checksum = "dc38c0ad57efb786dd57b9864e5b18bae478c00c824dc55a38bbc9da95dde3ba" dependencies = [ "bitflags", "crc32fast", @@ -2535,9 +2528,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c" dependencies = [ "bitflags", ] @@ -3158,9 +3151,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] @@ -3199,9 +3192,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.14.2" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "thiserror" @@ -3913,7 +3906,7 @@ name = "zola" version = "0.16.0" dependencies = [ "atty", - "clap 3.1.2", + "clap 3.1.5", "clap_complete", "ctrlc", "errors", diff --git a/components/libs/Cargo.toml b/components/libs/Cargo.toml index 7ce339a9..8f8d5bd6 100644 --- a/components/libs/Cargo.toml +++ b/components/libs/Cargo.toml @@ -44,10 +44,6 @@ relative-path = "1" glob = "0.3" -[dev-dependencies] -mockito = "0.30" - - [features] rust-tls = ["reqwest/rustls-tls"] native-tls = ["reqwest/default-tls"] diff --git a/components/link_checker/Cargo.toml b/components/link_checker/Cargo.toml index d0d6a2c6..8a5e9720 100644 --- a/components/link_checker/Cargo.toml +++ b/components/link_checker/Cargo.toml @@ -10,4 +10,4 @@ utils = { path = "../utils" } libs = { path = "../libs" } [dev-dependencies] -mockito = "0.30" +mockito = "0.31" diff --git a/components/rendering/src/markdown.rs b/components/rendering/src/markdown.rs index cca0932f..68d0b237 100644 --- a/components/rendering/src/markdown.rs +++ b/components/rendering/src/markdown.rs @@ -451,7 +451,7 @@ pub fn markdown_to_html( inserted_anchors.push(heading_ref.id.clone().unwrap()); let id = inserted_anchors.last().unwrap(); - let html = heading_ref.to_html(&id); + let html = heading_ref.to_html(id); events[start_idx] = Event::Html(html.into()); // generate anchors and places to insert them diff --git a/components/templates/Cargo.toml b/components/templates/Cargo.toml index 81c23675..53925b99 100644 --- a/components/templates/Cargo.toml +++ b/components/templates/Cargo.toml @@ -16,5 +16,5 @@ libs = { path = "../libs" } [dev-dependencies] -mockito = "0.30" +mockito = "0.31" tempfile = "3"