Remove unused imports; Lints.

This commit is contained in:
Heiko Schaefer 2021-07-16 18:44:59 +02:00
parent 77e32e02c2
commit f59a8a948c
7 changed files with 11 additions and 16 deletions

View file

@ -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![])
}

View file

@ -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)

View file

@ -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 {

View file

@ -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(),

View file

@ -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,

View file

@ -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);

View file

@ -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!();
}