From 1dfadc7e272d52dcff97a960aa45e1acf9eb56ad Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Sun, 1 Jan 2023 13:29:30 +0000
Subject: [PATCH] Clean up `key::filter_connected`

---
 src/key.rs | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/key.rs b/src/key.rs
index 47e0ea0..532837b 100644
--- a/src/key.rs
+++ b/src/key.rs
@@ -39,21 +39,16 @@ pub(crate) fn is_connected(reader: Reader) -> bool {
 
 pub(crate) fn filter_connected(reader: &Reader) -> bool {
     match reader.open() {
-        Ok(_) => true,
-        Err(e) => {
-            use std::error::Error;
-            if let Some(pcsc::Error::RemovedCard) =
-                e.source().and_then(|inner| inner.downcast_ref())
-            {
-                warn!(
-                    "{}",
-                    fl!("warn-yk-not-connected", yubikey_name = reader.name())
-                );
-                false
-            } else {
-                true
-            }
+        Err(yubikey::Error::PcscError {
+            inner: Some(pcsc::Error::RemovedCard),
+        }) => {
+            warn!(
+                "{}",
+                fl!("warn-yk-not-connected", yubikey_name = reader.name())
+            );
+            false
         }
+        _ => true,
     }
 }