From f59a8a948cbfa4adb9eed422f80aec0e9b133e36 Mon Sep 17 00:00:00 2001
From: Heiko Schaefer <heiko@schaefer.name>
Date: Fri, 16 Jul 2021 18:44:59 +0200
Subject: [PATCH] Remove unused imports; Lints.

---
 card-functionality/src/main.rs                 | 4 ++--
 card-functionality/src/util.rs                 | 3 +--
 openpgp-card/src/card_app.rs                   | 4 ++--
 openpgp-card/src/key_upload.rs                 | 2 +-
 openpgp-card/src/lib.rs                        | 3 +--
 openpgp-card/src/parse/key_generation_times.rs | 7 ++-----
 scdc/src/lib.rs                                | 4 ++--
 7 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/card-functionality/src/main.rs b/card-functionality/src/main.rs
index 198e3de..72122f9 100644
--- a/card-functionality/src/main.rs
+++ b/card-functionality/src/main.rs
@@ -33,7 +33,7 @@ use sequoia_openpgp::Cert;
 
 use openpgp_card::apdu::PcscClient;
 use openpgp_card::card_app::CardApp;
-use openpgp_card::{CardClientBox, KeyType, Sex};
+use openpgp_card::{CardClientBox, Sex};
 
 mod util;
 
@@ -141,7 +141,7 @@ fn test_keygen() {
 }
 
 fn test_reset(ca: &mut CardApp) -> Result<TestOutput> {
-    let res = ca.factory_reset()?;
+    let _res = ca.factory_reset()?;
     Ok(vec![])
 }
 
diff --git a/card-functionality/src/util.rs b/card-functionality/src/util.rs
index 2286104..44fd473 100644
--- a/card-functionality/src/util.rs
+++ b/card-functionality/src/util.rs
@@ -17,7 +17,6 @@ pub(crate) fn upload_subkeys(
     cert: &Cert,
 ) -> Result<Vec<(String, u32)>> {
     let mut out = vec![];
-    let mut gentime = 0;
 
     for kt in [
         KeyType::Signing,
@@ -39,7 +38,7 @@ pub(crate) fn upload_subkeys(
 
         // upload key
         let cuk = vka_as_uploadable_key(vka, None);
-        let res = ca.upload_key(cuk, kt)?;
+        let _ = ca.upload_key(cuk, kt)?;
     }
 
     Ok(out)
diff --git a/openpgp-card/src/card_app.rs b/openpgp-card/src/card_app.rs
index e1a6fbd..8f61c1b 100644
--- a/openpgp-card/src/card_app.rs
+++ b/openpgp-card/src/card_app.rs
@@ -25,8 +25,8 @@ use crate::parse::{
 };
 use crate::tlv::{tag::Tag, Tlv, TlvEntry};
 use crate::{
-    apdu, key_upload, parse, tlv, CardCaps, CardClientBox, CardUploadableKey,
-    DecryptMe, Hash, KeyType, Sex,
+    apdu, key_upload, CardCaps, CardClientBox, CardUploadableKey, DecryptMe,
+    Hash, KeyType, Sex,
 };
 
 pub struct CardApp {
diff --git a/openpgp-card/src/key_upload.rs b/openpgp-card/src/key_upload.rs
index c24099c..8c5f8ac 100644
--- a/openpgp-card/src/key_upload.rs
+++ b/openpgp-card/src/key_upload.rs
@@ -67,7 +67,7 @@ pub(crate) fn upload_key(
         }
     };
 
-    let caps: Option<CardCaps> = card_app.card_caps().map(|c| c.clone());
+    let caps: Option<CardCaps> = card_app.card_caps().copied();
 
     copy_key_to_card(
         card_app.card(),
diff --git a/openpgp-card/src/lib.rs b/openpgp-card/src/lib.rs
index 3224d64..61e644e 100644
--- a/openpgp-card/src/lib.rs
+++ b/openpgp-card/src/lib.rs
@@ -2,9 +2,8 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use anyhow::{anyhow, Result};
-use pcsc::*;
 
-use apdu::{commands, response::Response};
+use apdu::response::Response;
 use parse::{
     algo_attrs::Algo, algo_info::AlgoInfo, application_id::ApplicationId,
     cardholder::CardHolder, extended_cap::ExtendedCap, extended_cap::Features,
diff --git a/openpgp-card/src/parse/key_generation_times.rs b/openpgp-card/src/parse/key_generation_times.rs
index b5c5ce0..f4a624e 100644
--- a/openpgp-card/src/parse/key_generation_times.rs
+++ b/openpgp-card/src/parse/key_generation_times.rs
@@ -2,14 +2,11 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use anyhow::anyhow;
-use nom::{
-    bytes::complete as bytes, combinator, number::complete as number, sequence,
-};
-use std::fmt;
+use chrono::{DateTime, NaiveDateTime, Utc};
+use nom::{combinator, number::complete as number, sequence};
 
 use crate::errors::OpenpgpCardError;
 use crate::parse::KeySet;
-use chrono::{DateTime, NaiveDateTime, Utc};
 
 #[derive(Clone, Eq, PartialEq, Debug)]
 pub struct KeyGeneration(u32);
diff --git a/scdc/src/lib.rs b/scdc/src/lib.rs
index c88a3fe..c946b3b 100644
--- a/scdc/src/lib.rs
+++ b/scdc/src/lib.rs
@@ -57,7 +57,7 @@ impl ScdClient {
         let mut rt = RT.lock().unwrap();
 
         while let Some(response) = rt.block_on(self.client.next()) {
-            if let Err(_) = response {
+            if response.is_err() {
                 return Err(anyhow!("Card not found"));
             }
 
@@ -85,7 +85,7 @@ impl CardClient for ScdClient {
 
         while let Some(response) = rt.block_on(self.client.next()) {
             log::trace!("res: {:x?}", response);
-            if let Err(_) = response {
+            if response.is_err() {
                 unimplemented!();
             }