Skip to content

Commit

Permalink
Merge pull request #1815 from fintelia/fix-ci
Browse files Browse the repository at this point in the history
Fix warnings and CI issues
  • Loading branch information
fintelia committed Oct 31, 2022
2 parents c874eab + ae28510 commit 1878c88
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Expand Up @@ -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)"
Expand Down
1 change: 1 addition & 0 deletions deny.toml
Expand Up @@ -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
]
Expand Down
6 changes: 4 additions & 2 deletions src/dynimage.rs
Expand Up @@ -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;
Expand Down Expand Up @@ -1332,7 +1334,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,
}
}

Expand Down

0 comments on commit 1878c88

Please sign in to comment.