Merge branch 'image-rs:master' into Check-dimensions-for-dyn-image-be…

…fore-resizing

.github/workflows/rust.yml

@@ -157,7 +157,7 @@ jobs:
         cargo afl check --bin fuzz_webp
         cargo afl check --bin fuzz_pnm
       env:
-        RUSTFLAGS: "-Znew-llvm-pass-manager=no"
+        RUSTFLAGS: ""
 
   build_fuzz_cargo-fuzz:
     name: "Fuzz targets (cargo-fuzz)"

deny.toml

@@ -26,6 +26,7 @@ wildcards = "allow" # at least until https://github.com/EmbarkStudios/cargo-deny
 deny = []
 skip = []
 skip-tree = [
+    { name = "flate2", version = "=1.0.24" }, # until a new version is published
     { name = "criterion" },  # dev-dependency
     { name = "quickcheck" }, # dev-dependency
 ]

src/dynimage.rs

@@ -19,7 +19,9 @@ use crate::error::{ImageError, ImageResult, ParameterError, ParameterErrorKind};
 // FIXME: These imports exist because we don't support all of our own color types.
 use crate::error::{ImageFormatHint, UnsupportedError, UnsupportedErrorKind};
 use crate::flat::FlatSamples;
-use crate::image::{GenericImage, GenericImageView, ImageDecoder, ImageFormat, ImageOutputFormat, ImageEncoder};
+use crate::image::{
+    GenericImage, GenericImageView, ImageDecoder, ImageEncoder, ImageFormat, ImageOutputFormat,
+};
 use crate::imageops;
 use crate::io::free_functions;
 use crate::math::resize_dimensions;
@@ -1335,7 +1337,7 @@ mod test {
         // ensures that DynamicImage implements Default (if it didn't, this would cause a compile error).
         #[derive(Default)]
         struct Foo {
-            image: super::DynamicImage,
+            _image: super::DynamicImage,
         }
     }