From d9ddf82499df8074865ab4d3820095b1c2604a78 Mon Sep 17 00:00:00 2001 From: Mrmaxmeier <3913977+Mrmaxmeier@users.noreply.github.com> Date: Tue, 17 Dec 2024 21:08:32 +0100 Subject: [PATCH] libafl_{cc,derive}: Bump MSRV to 1.82 for `home` crate update (#2775) * libafl_{cc,derive}: Bump MSRV for `home` crate update With the upcoming 2024 edition we should also set `resolver = "3"` in the workspace's Cargo.toml to opt into a new MSRV-aware dependency resolver. This would fix the breakage we encountered with dependencies that bump their MSRV in a minor version update. * libafl_cc: apply clippy suggestion --- libafl_cc/Cargo.toml | 2 +- libafl_cc/src/cfg.rs | 2 +- libafl_derive/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libafl_cc/Cargo.toml b/libafl_cc/Cargo.toml index 5c89b8c39d..6974aeddcf 100644 --- a/libafl_cc/Cargo.toml +++ b/libafl_cc/Cargo.toml @@ -9,7 +9,7 @@ readme = "README.md" license = "MIT OR Apache-2.0" keywords = ["fuzzing", "testing", "compiler"] edition = "2021" -rust-version = "1.78" +rust-version = "1.82" categories = [ "development-tools::testing", "emulators", diff --git a/libafl_cc/src/cfg.rs b/libafl_cc/src/cfg.rs index 0551bb8b97..49789f3c5c 100644 --- a/libafl_cc/src/cfg.rs +++ b/libafl_cc/src/cfg.rs @@ -317,7 +317,7 @@ where let new_distance = distance + successor_info.get_weight(); let is_shorter = distances .get(successor) - .map_or(true, |¤t| new_distance < current); + .is_none_or(|¤t| new_distance < current); if is_shorter { distances.insert(*successor, new_distance); diff --git a/libafl_derive/Cargo.toml b/libafl_derive/Cargo.toml index 2cc461b66c..cd2d76a61b 100644 --- a/libafl_derive/Cargo.toml +++ b/libafl_derive/Cargo.toml @@ -9,7 +9,7 @@ readme = "../README.md" license = "MIT OR Apache-2.0" keywords = ["fuzzing", "testing"] edition = "2021" -rust-version = "1.78" +rust-version = "1.82" categories = [ "development-tools::testing", "emulators",