From 6bc36409ff6d03f1852b2feeb370127afa0baf38 Mon Sep 17 00:00:00 2001
From: Jonathan Behrens <fintelia@gmail.com>
Date: Wed, 26 Oct 2022 18:22:06 -0700
Subject: [PATCH 1/2] Fix warnings and cargo deny issues

---
 .github/workflows/rust.yml | 2 +-
 deny.toml                  | 1 +
 src/dynimage.rs            | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 9e6f2f795f..d0a5d10064 100644
--- a/.github/workflows/rust.yml
+++ b/.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)"
diff --git a/deny.toml b/deny.toml
index 84673e3572..f5be0a996c 100644
--- a/deny.toml
+++ b/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
 ]
diff --git a/src/dynimage.rs b/src/dynimage.rs
index 682e1ebb3b..51f023af3c 100644
--- a/src/dynimage.rs
+++ b/src/dynimage.rs
@@ -1332,7 +1332,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,
         }
     }
 

From ae28510d73b68a776ec7519b97525fb08f038e6c Mon Sep 17 00:00:00 2001
From: Jonathan Behrens <fintelia@gmail.com>
Date: Sun, 30 Oct 2022 16:59:09 -0700
Subject: [PATCH 2/2] rustfmt

---
 src/dynimage.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/dynimage.rs b/src/dynimage.rs
index 51f023af3c..f12ff5d139 100644
--- a/src/dynimage.rs
+++ b/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;