From f6e3614fe942b753af4c77e2a236d703bede6a6f Mon Sep 17 00:00:00 2001 From: Kornel Date: Tue, 9 Jul 2024 14:24:21 +0100 Subject: [PATCH] Use Rust 1.60 feature syntax --- Cargo.toml | 10 ++++++---- tests/flags.rs | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e5a8aa57..88b29744 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -83,11 +83,13 @@ clap_mangen = "0.2.20" rustc_version = "0.4.0" [features] -binary = ["clap", "glob", "env_logger"] -default = ["binary", "filetime", "parallel", "zopfli"] -parallel = ["rayon", "indexmap/rayon", "crossbeam-channel"] +binary = ["dep:clap", "dep:glob", "dep:env_logger"] +default = ["binary", "parallel", "zopfli", "filetime"] +parallel = ["dep:rayon", "indexmap/rayon", "dep:crossbeam-channel"] freestanding = ["libdeflater/freestanding"] -sanity-checks = ["image"] +sanity-checks = ["dep:image"] +zopfli = ["dep:zopfli"] +filetime = ["dep:filetime"] [lib] name = "oxipng" diff --git a/tests/flags.rs b/tests/flags.rs index f925740a..887da87c 100644 --- a/tests/flags.rs +++ b/tests/flags.rs @@ -165,7 +165,7 @@ fn verbose_mode() { ); }; - #[cfg(feature = "rayon")] + #[cfg(feature = "parallel")] rayon::ThreadPoolBuilder::new() .start_handler(move |_| thread_init()) .num_threads(rayon::current_num_threads() + 1) @@ -173,7 +173,7 @@ fn verbose_mode() { .unwrap() .install(move || rayon::spawn(thread_exec)); - #[cfg(not(feature = "rayon"))] + #[cfg(not(feature = "parallel"))] std::thread::spawn(move || { thread_init(); thread_exec();