From f05c635d7b9d74d3240f6cab9cb52750b1ac7b15 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Thu, 15 Apr 2021 22:22:07 +1200
Subject: [PATCH] clippy fixes

---
 src/main.rs    |  7 +------
 src/yubikey.rs | 13 ++++++-------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index d03b366..697387e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -291,12 +291,7 @@ fn main() -> Result<(), Error> {
         eprintln!("make your choice, or press [Esc] or [q] to quit.");
         eprintln!();
 
-        if Readers::open()?
-            .iter()?
-            .filter(yubikey::filter_connected)
-            .next()
-            .is_none()
-        {
+        if !Readers::open()?.iter()?.any(yubikey::is_connected) {
             eprintln!("⏳ Please insert the YubiKey you want to set up.");
         };
         let mut readers = yubikey::wait_for_readers()?;
diff --git a/src/yubikey.rs b/src/yubikey.rs
index 3fc3a5d..101b0b5 100644
--- a/src/yubikey.rs
+++ b/src/yubikey.rs
@@ -33,6 +33,10 @@ use crate::{
 const ONE_SECOND: Duration = Duration::from_secs(1);
 const FIFTEEN_SECONDS: Duration = Duration::from_secs(15);
 
+pub(crate) fn is_connected(reader: Reader) -> bool {
+    filter_connected(&reader)
+}
+
 pub(crate) fn filter_connected(reader: &Reader) -> bool {
     match reader.open() {
         Ok(_) => true,
@@ -55,7 +59,7 @@ pub(crate) fn wait_for_readers() -> Result<Readers, Error> {
     let start = SystemTime::now();
     loop {
         let mut readers = Readers::open()?;
-        if readers.iter()?.filter(filter_connected).next().is_some() {
+        if readers.iter()?.any(is_connected) {
             break Ok(readers);
         }
 
@@ -67,12 +71,7 @@ pub(crate) fn wait_for_readers() -> Result<Readers, Error> {
 }
 
 pub(crate) fn open(serial: Option<Serial>) -> Result<YubiKey, Error> {
-    if Readers::open()?
-        .iter()?
-        .filter(filter_connected)
-        .next()
-        .is_none()
-    {
+    if !Readers::open()?.iter()?.any(is_connected) {
         if let Some(serial) = serial {
             eprintln!("⏳ Please insert the YubiKey with serial {}.", serial);
         } else {