From 0d5fefd446de9f08bc67ccdd668d0eec9d3c2340 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Mon, 10 Feb 2020 20:48:52 +0100 Subject: [PATCH] Update image to 0.23 --- Cargo.lock | 45 +++++++++++++++++++++++--- components/errors/Cargo.toml | 2 +- components/imageproc/Cargo.toml | 2 +- components/imageproc/src/lib.rs | 12 +++---- components/rendering/tests/markdown.rs | 7 ++-- components/utils/src/slugs.rs | 4 ++- src/cmd/check.rs | 2 +- src/cmd/serve.rs | 11 +++++-- 8 files changed, 64 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b3df937..b4ac741 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -127,7 +127,7 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.1.2" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -135,6 +135,11 @@ name = "byte-tools" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "bytemuck" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "byteorder" version = "1.3.4" @@ -416,7 +421,7 @@ dependencies = [ name = "errors" version = "0.1.0" dependencies = [ - "image 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -842,12 +847,29 @@ dependencies = [ "tiff 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "image" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bytemuck 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "gif 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", + "jpeg-decoder 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "num-iter 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", + "num-rational 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "png 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", + "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "tiff 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "imageproc" version = "0.1.0" dependencies = [ "errors 0.1.0", - "image 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2274,6 +2296,16 @@ dependencies = [ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "tiff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "time" version = "0.1.42" @@ -2561,7 +2593,7 @@ name = "wasm-bindgen-backend" version = "0.2.58" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bumpalo 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "bumpalo 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2785,8 +2817,9 @@ dependencies = [ "checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" "checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" "checksum bstr 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "502ae1441a0a5adb8fbd38a5955a6416b9493e92b465de5e4a9bde6a539c2c48" -"checksum bumpalo 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5fb8038c1ddc0a5f73787b130f4cc75151e96ed33e417fde765eb5a81e3532f4" +"checksum bumpalo 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742" "checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" +"checksum bytemuck 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37fa13df2292ecb479ec23aa06f4507928bef07839be9ef15281411076629431" "checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" "checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" @@ -2862,6 +2895,7 @@ dependencies = [ "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" "checksum ignore 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "522daefc3b69036f80c7d2990b28ff9e0471c683bad05ca258e0a01dd22c5a1e" "checksum image 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)" = "08ed2ada878397b045454ac7cfb011d73132c59f31a955d230bd1f1c2e68eb4a" +"checksum image 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef4e336ec01a678e7ab692914c641181528e8656451e6252f8f9e33728882eaf" "checksum indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292" "checksum inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" "checksum inotify 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24e40d6fd5d64e2082e0c796495c8ef5ad667a96d03e5aaa0becfd9d47bcbfb8" @@ -3007,6 +3041,7 @@ dependencies = [ "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" "checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" "checksum tiff 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d7b7c2cfc4742bd8a32f2e614339dd8ce30dbcf676bb262bd63a2327bc5df57d" +"checksum tiff 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "002351e428db1eb1d8656d4ca61947c3519ac3191e1c804d4600cd32093b77ad" "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" "checksum tokio 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8fdd17989496f49cdc57978c96f0c9fe5e4a58a8bddc6813c449a4624f6a030b" "checksum tokio-macros 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f4b1e7ed7d5d4c2af3d999904b0eebe76544897cdbfb2b9684bed2174ab20f7c" diff --git a/components/errors/Cargo.toml b/components/errors/Cargo.toml index cdece02..46d7d25 100644 --- a/components/errors/Cargo.toml +++ b/components/errors/Cargo.toml @@ -7,5 +7,5 @@ edition = "2018" [dependencies] tera = "1" toml = "0.5" -image = "0.22" +image = "0.23" syntect = "=3.2.0" diff --git a/components/imageproc/Cargo.toml b/components/imageproc/Cargo.toml index 9686e43..b454797 100644 --- a/components/imageproc/Cargo.toml +++ b/components/imageproc/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" lazy_static = "1" regex = "1.0" tera = "1" -image = "0.22" +image = "0.23" rayon = "1" errors = { path = "../errors" } diff --git a/components/imageproc/src/lib.rs b/components/imageproc/src/lib.rs index 1310a2e..0b0a8b4 100644 --- a/components/imageproc/src/lib.rs +++ b/components/imageproc/src/lib.rs @@ -5,9 +5,8 @@ use std::fs::{self, File}; use std::hash::{Hash, Hasher}; use std::path::{Path, PathBuf}; -use image::jpeg::JPEGEncoder; -use image::png::PNGEncoder; -use image::{FilterType, GenericImageView}; +use image::imageops::FilterType; +use image::{GenericImageView, ImageOutputFormat}; use lazy_static::lazy_static; use rayon::prelude::*; use regex::Regex; @@ -296,16 +295,13 @@ impl ImageOp { }; let mut f = File::create(target_path)?; - let (img_w, img_h) = img.dimensions(); match self.format { Format::Png => { - let enc = PNGEncoder::new(&mut f); - enc.encode(&img.raw_pixels(), img_w, img_h, img.color())?; + img.write_to(&mut f, ImageOutputFormat::Png)?; } Format::Jpeg(q) => { - let mut enc = JPEGEncoder::new_with_quality(&mut f, q); - enc.encode(&img.raw_pixels(), img_w, img_h, img.color())?; + img.write_to(&mut f, ImageOutputFormat::Jpeg(q))?; } } diff --git a/components/rendering/tests/markdown.rs b/components/rendering/tests/markdown.rs index 34475bc..93172be 100644 --- a/components/rendering/tests/markdown.rs +++ b/components/rendering/tests/markdown.rs @@ -625,11 +625,14 @@ fn can_understand_footnote_in_heading() { let config = Config::default(); let context = RenderContext::new(&ZOLA_TERA, &config, "", &permalinks_ctx, InsertAnchor::None); let res = render_content("# text [^1] there\n[^1]: footnote", &context).unwrap(); - assert_eq!(res.body, r##"

text 1 there

+ assert_eq!( + res.body, + r##"

text 1 there

1

footnote

-"##); +"## + ); } #[test] diff --git a/components/utils/src/slugs.rs b/components/utils/src/slugs.rs index 6e44e12..476eec5 100644 --- a/components/utils/src/slugs.rs +++ b/components/utils/src/slugs.rs @@ -35,7 +35,9 @@ pub fn slugify_paths(s: &str, strategy: SlugifyStrategy) -> String { pub fn slugify_anchors(s: &str, strategy: SlugifyStrategy) -> String { match strategy { SlugifyStrategy::On => slug::slugify(s), - SlugifyStrategy::Safe | SlugifyStrategy::Off => s.replace(|c: char| c.is_ascii_whitespace(), "_"), + SlugifyStrategy::Safe | SlugifyStrategy::Off => { + s.replace(|c: char| c.is_ascii_whitespace(), "_") + } } } diff --git a/src/cmd/check.rs b/src/cmd/check.rs index de2e841..e354e7b 100644 --- a/src/cmd/check.rs +++ b/src/cmd/check.rs @@ -1,4 +1,4 @@ -use std::path::{Path,PathBuf}; +use std::path::{Path, PathBuf}; use errors::Result; use site::Site; diff --git a/src/cmd/serve.rs b/src/cmd/serve.rs index ce00717..3d4c786 100644 --- a/src/cmd/serve.rs +++ b/src/cmd/serve.rs @@ -202,8 +202,15 @@ pub fn serve( include_drafts: bool, ) -> Result<()> { let start = Instant::now(); - let (mut site, address) = - create_new_site(root_dir, interface, port, output_dir, base_url, config_file, include_drafts)?; + let (mut site, address) = create_new_site( + root_dir, + interface, + port, + output_dir, + base_url, + config_file, + include_drafts, + )?; console::report_elapsed_time(start); // Setup watchers