From 760b296a955ec249563c70a7679ffa1053bebec1 Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Tue, 5 Nov 2024 06:17:19 +0000 Subject: [PATCH 1/4] Remove references to PCX from Cargo.toml --- Cargo.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8fb04935da..1f5fd27563 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,6 @@ exr = { version = "1.5.0", optional = true } gif = { version = "0.13", optional = true } image-webp = { version = "0.2.0", optional = true } mp4parse = { version = "0.17.0", optional = true } -pcx = { version = "0.2.3", optional = true } png = { version = "0.17.6", optional = true } qoi = { version = "0.4", optional = true } ravif = { version = "0.11.11", default-features = false, optional = true } @@ -78,7 +77,6 @@ gif = ["dep:gif", "dep:color_quant"] hdr = [] ico = ["bmp", "png"] jpeg = ["dep:zune-core", "dep:zune-jpeg"] -pcx = ["dep:pcx"] # Note that the PCX dependency uses the WTFPL license png = ["dep:png"] pnm = [] qoi = ["dep:qoi"] From b7fb99b3e45dc3a857dc5998c80f2b22ab2302c7 Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Tue, 5 Nov 2024 06:23:15 +0000 Subject: [PATCH 2/4] Suppress warnings about nonexistent feature --- src/lib.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/lib.rs b/src/lib.rs index af7296af8b..b5968a02b2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -118,6 +118,14 @@ #![deny(missing_copy_implementations)] #![cfg_attr(all(test, feature = "benchmarks"), feature(test))] #![cfg_attr(docsrs, feature(doc_auto_cfg))] +// We've temporarily disabled PCX support for 0.25.5 release +// by removing the corresponding feature. +// We want to ship bug fixes without committing to PCX support. +// +// Cargo shows warnings about code depending on a nonexistent feature +// even to people using the crate as a dependency, +// so we have to suppress those warnings. +#![allow(unexpected_cfgs)] #[cfg(all(test, feature = "benchmarks"))] extern crate test; From 549d6f333806dc8e7fe59f6958cacbd46b1080e5 Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Tue, 5 Nov 2024 06:26:52 +0000 Subject: [PATCH 3/4] Remove references to PCX from documentation --- README.md | 1 - src/lib.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 4fff85b666..e3eb168058 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,6 @@ image format encoders and decoders. | ICO | Yes | Yes | | JPEG | Yes | Yes | | EXR | Yes | Yes | -| PCX | Yes | --- | | PNG | Yes | Yes | | PNM | Yes | Yes | | QOI | Yes | Yes | diff --git a/src/lib.rs b/src/lib.rs index b5968a02b2..1266c2f070 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -222,7 +222,6 @@ pub mod flat; /// | ICO | Yes | Yes | /// | JPEG | Yes | Yes | /// | EXR | Yes | Yes | -/// | PCX | Yes | --- | /// | PNG | Yes | Yes | /// | PNM | Yes | Yes | /// | QOI | Yes | Yes | From 7b47061643269103f78fcd606df7ea74c9276235 Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Tue, 5 Nov 2024 06:46:50 +0000 Subject: [PATCH 4/4] Drop PCX from CI feature matrix --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3c6a25c737..96da5d9a9c 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - features: ['', default, rayon, avif, bmp, dds, exr, ff, gif, hdr, ico, jpeg, pcx, png, pnm, qoi, tga, tiff, webp] + features: ['', default, rayon, avif, bmp, dds, exr, ff, gif, hdr, ico, jpeg, png, pnm, qoi, tga, tiff, webp] steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable