From bbfcd4c8fc47e3d15283e2b552841f67739a8fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edvin=20=C3=85kerfeldt?= <edvin.akerfeldt@volvocars.com>
Date: Thu, 19 Oct 2023 16:23:30 +0200
Subject: [PATCH 1/2] Fix clippy warnings added in 1.73.0

Fixed clippy recommendation regarding `filter_map`, see clippy lint
`filter_map_bool_then` for details.
---
 mcan/CHANGELOG.md                | 1 +
 mcan/src/rx_dedicated_buffers.rs | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mcan/CHANGELOG.md b/mcan/CHANGELOG.md
index cb6805c..67750a8 100644
--- a/mcan/CHANGELOG.md
+++ b/mcan/CHANGELOG.md
@@ -3,6 +3,7 @@
 Tagging in git follows a pattern: `mcan/<version>`.
 
 ## [Unreleased]
+- Adhere to `filter_map_bool_then` clippy lint (#42)
 
 ## [0.3.0] - 2023-04-24
 
diff --git a/mcan/src/rx_dedicated_buffers.rs b/mcan/src/rx_dedicated_buffers.rs
index b171566..0970ef2 100644
--- a/mcan/src/rx_dedicated_buffers.rs
+++ b/mcan/src/rx_dedicated_buffers.rs
@@ -127,7 +127,8 @@ impl<'a, P: mcan_core::CanId, M: rx::AnyMessage> DynRxDedicatedBuffer
         self.memory
             .iter()
             .enumerate()
-            .filter_map(|(i, m)| self.has_new_data(i).then(|| (i, m.get())))
+            .filter(|&(i, _)| self.has_new_data(i))
+            .map(|(i, m)| (i, m.get()))
             .min_by_key(|(_, m)| m.id())
             .map(|(i, m)| {
                 self.mark_buffer_read(i);

From 323c5caff7285fcb01e53d5f6fceb06f9a80e956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edvin=20=C3=85kerfeldt?= <edvin.akerfeldt@volvocars.com>
Date: Fri, 20 Oct 2023 16:19:37 +0200
Subject: [PATCH 2/2] Fix warning regarding resolver

Resolver need to be set on workspace level.

See rust-lang/cargo#10112
---
 Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Cargo.toml b/Cargo.toml
index b3928b8..d8ac5e6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,3 +3,4 @@ members = [
     "mcan",
     "mcan-core",
 ]
+resolver = "2"